summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptCore/parser/ParserTokens.h
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-08-25 19:20:41 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-02-02 12:30:55 +0000
commit6882a04fb36642862b11efe514251d32070c3d65 (patch)
treeb7959826000b061fd5ccc7512035c7478742f7b0 /Source/JavaScriptCore/parser/ParserTokens.h
parentab6df191029eeeb0b0f16f127d553265659f739e (diff)
Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/JavaScriptCore/parser/ParserTokens.h')
-rw-r--r--Source/JavaScriptCore/parser/ParserTokens.h25
1 files changed, 23 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/parser/ParserTokens.h b/Source/JavaScriptCore/parser/ParserTokens.h
index 898fe62cb..aff4a3013 100644
--- a/Source/JavaScriptCore/parser/ParserTokens.h
+++ b/Source/JavaScriptCore/parser/ParserTokens.h
@@ -57,6 +57,7 @@ enum JSTokenType {
FOR,
NEW,
VAR,
+ LET,
CONSTTOKEN,
CONTINUE,
FUNCTION,
@@ -75,6 +76,12 @@ enum JSTokenType {
FINALLY,
DEBUGGER,
ELSE,
+ IMPORT,
+ EXPORT,
+ YIELD,
+ CLASSTOKEN,
+ EXTENDS,
+ SUPER,
OPENBRACE = 0,
CLOSEBRACE,
OPENPAREN,
@@ -83,9 +90,11 @@ enum JSTokenType {
CLOSEBRACKET,
COMMA,
QUESTION,
- NUMBER,
+ INTEGER,
+ DOUBLE,
IDENT,
STRING,
+ TEMPLATE,
SEMICOLON,
COLON,
DOT,
@@ -102,6 +111,8 @@ enum JSTokenType {
MODEQUAL,
XOREQUAL,
OREQUAL,
+ DOTDOTDOT,
+ ARROWFUNCTION,
LastUntaggedToken,
// Begin tagged tokens
@@ -144,10 +155,15 @@ enum JSTokenType {
INVALID_IDENTIFIER_UNICODE_ESCAPE_ERRORTOK = 3 | ErrorTokenFlag,
UNTERMINATED_MULTILINE_COMMENT_ERRORTOK = 4 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
UNTERMINATED_NUMERIC_LITERAL_ERRORTOK = 5 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
- INVALID_OCTAL_NUMBER_ERRORTOK = 6 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
+ UNTERMINATED_OCTAL_NUMBER_ERRORTOK = 6 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
INVALID_NUMERIC_LITERAL_ERRORTOK = 7 | ErrorTokenFlag,
UNTERMINATED_STRING_LITERAL_ERRORTOK = 8 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
INVALID_STRING_LITERAL_ERRORTOK = 9 | ErrorTokenFlag,
+ INVALID_PRIVATE_NAME_ERRORTOK = 10 | ErrorTokenFlag,
+ UNTERMINATED_HEX_NUMBER_ERRORTOK = 11 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
+ UNTERMINATED_BINARY_NUMBER_ERRORTOK = 12 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
+ UNTERMINATED_TEMPLATE_LITERAL_ERRORTOK = 13 | ErrorTokenFlag | UnterminatedErrorTokenFlag,
+ INVALID_TEMPLATE_LITERAL_ERRORTOK = 14 | ErrorTokenFlag,
};
struct JSTextPosition {
@@ -175,6 +191,11 @@ union JSTokenData {
};
double doubleValue;
const Identifier* ident;
+ struct {
+ const Identifier* cooked;
+ const Identifier* raw;
+ bool isTail;
+ };
};
struct JSTokenLocation {