diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/JavaScriptCore/parser/ParserTokens.h | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/JavaScriptCore/parser/ParserTokens.h')
| -rw-r--r-- | Source/JavaScriptCore/parser/ParserTokens.h | 25 |
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 { |