| Index: src/scanner.cc
|
| diff --git a/src/scanner.cc b/src/scanner.cc
|
| index 0e9de14ca9928659bdffb49a5e44a7cfaa11f0a2..72874aacaea5e982ce6bc80471e7c0c282677748 100644
|
| --- a/src/scanner.cc
|
| +++ b/src/scanner.cc
|
| @@ -902,70 +902,73 @@ uc32 Scanner::ScanIdentifierUnicodeEscape() {
|
| // ----------------------------------------------------------------------------
|
| // Keyword Matcher
|
|
|
| -#define KEYWORDS(KEYWORD_GROUP, KEYWORD) \
|
| - KEYWORD_GROUP('b') \
|
| - KEYWORD("break", Token::BREAK) \
|
| - KEYWORD_GROUP('c') \
|
| - KEYWORD("case", Token::CASE) \
|
| - KEYWORD("catch", Token::CATCH) \
|
| - KEYWORD("class", Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD("const", Token::CONST) \
|
| - KEYWORD("continue", Token::CONTINUE) \
|
| - KEYWORD_GROUP('d') \
|
| - KEYWORD("debugger", Token::DEBUGGER) \
|
| - KEYWORD("default", Token::DEFAULT) \
|
| - KEYWORD("delete", Token::DELETE) \
|
| - KEYWORD("do", Token::DO) \
|
| - KEYWORD_GROUP('e') \
|
| - KEYWORD("else", Token::ELSE) \
|
| - KEYWORD("enum", Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD("export", \
|
| - harmony_modules ? Token::EXPORT : Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD("extends", Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD_GROUP('f') \
|
| - KEYWORD("false", Token::FALSE_LITERAL) \
|
| - KEYWORD("finally", Token::FINALLY) \
|
| - KEYWORD("for", Token::FOR) \
|
| - KEYWORD("function", Token::FUNCTION) \
|
| - KEYWORD_GROUP('i') \
|
| - KEYWORD("if", Token::IF) \
|
| - KEYWORD("implements", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD("import", \
|
| - harmony_modules ? Token::IMPORT : Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD("in", Token::IN) \
|
| - KEYWORD("instanceof", Token::INSTANCEOF) \
|
| - KEYWORD("interface", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD_GROUP('l') \
|
| - KEYWORD("let", \
|
| - harmony_scoping ? Token::LET : Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD_GROUP('n') \
|
| - KEYWORD("new", Token::NEW) \
|
| - KEYWORD("null", Token::NULL_LITERAL) \
|
| - KEYWORD_GROUP('p') \
|
| - KEYWORD("package", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD("private", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD("protected", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD("public", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD_GROUP('r') \
|
| - KEYWORD("return", Token::RETURN) \
|
| - KEYWORD_GROUP('s') \
|
| - KEYWORD("static", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| - KEYWORD("super", \
|
| - harmony_classes ? Token::SUPER : Token::FUTURE_RESERVED_WORD) \
|
| - KEYWORD("switch", Token::SWITCH) \
|
| - KEYWORD_GROUP('t') \
|
| - KEYWORD("this", Token::THIS) \
|
| - KEYWORD("throw", Token::THROW) \
|
| - KEYWORD("true", Token::TRUE_LITERAL) \
|
| - KEYWORD("try", Token::TRY) \
|
| - KEYWORD("typeof", Token::TYPEOF) \
|
| - KEYWORD_GROUP('v') \
|
| - KEYWORD("var", Token::VAR) \
|
| - KEYWORD("void", Token::VOID) \
|
| - KEYWORD_GROUP('w') \
|
| - KEYWORD("while", Token::WHILE) \
|
| - KEYWORD("with", Token::WITH) \
|
| - KEYWORD_GROUP('y') \
|
| +#define KEYWORDS(KEYWORD_GROUP, KEYWORD) \
|
| + KEYWORD_GROUP('b') \
|
| + KEYWORD("break", Token::BREAK) \
|
| + KEYWORD_GROUP('c') \
|
| + KEYWORD("case", Token::CASE) \
|
| + KEYWORD("catch", Token::CATCH) \
|
| + KEYWORD("class", \
|
| + harmony_classes ? Token::CLASS : Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD("const", Token::CONST) \
|
| + KEYWORD("continue", Token::CONTINUE) \
|
| + KEYWORD_GROUP('d') \
|
| + KEYWORD("debugger", Token::DEBUGGER) \
|
| + KEYWORD("default", Token::DEFAULT) \
|
| + KEYWORD("delete", Token::DELETE) \
|
| + KEYWORD("do", Token::DO) \
|
| + KEYWORD_GROUP('e') \
|
| + KEYWORD("else", Token::ELSE) \
|
| + KEYWORD("enum", Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD("export", \
|
| + harmony_modules ? Token::EXPORT : Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD("extends", \
|
| + harmony_classes ? Token::EXTENDS : Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD_GROUP('f') \
|
| + KEYWORD("false", Token::FALSE_LITERAL) \
|
| + KEYWORD("finally", Token::FINALLY) \
|
| + KEYWORD("for", Token::FOR) \
|
| + KEYWORD("function", Token::FUNCTION) \
|
| + KEYWORD_GROUP('i') \
|
| + KEYWORD("if", Token::IF) \
|
| + KEYWORD("implements", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD("import", \
|
| + harmony_modules ? Token::IMPORT : Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD("in", Token::IN) \
|
| + KEYWORD("instanceof", Token::INSTANCEOF) \
|
| + KEYWORD("interface", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD_GROUP('l') \
|
| + KEYWORD("let", \
|
| + harmony_scoping ? Token::LET : Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD_GROUP('n') \
|
| + KEYWORD("new", Token::NEW) \
|
| + KEYWORD("null", Token::NULL_LITERAL) \
|
| + KEYWORD_GROUP('p') \
|
| + KEYWORD("package", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD("private", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD("protected", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD("public", Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD_GROUP('r') \
|
| + KEYWORD("return", Token::RETURN) \
|
| + KEYWORD_GROUP('s') \
|
| + KEYWORD("static", harmony_classes ? Token::STATIC \
|
| + : Token::FUTURE_STRICT_RESERVED_WORD) \
|
| + KEYWORD("super", \
|
| + harmony_classes ? Token::SUPER : Token::FUTURE_RESERVED_WORD) \
|
| + KEYWORD("switch", Token::SWITCH) \
|
| + KEYWORD_GROUP('t') \
|
| + KEYWORD("this", Token::THIS) \
|
| + KEYWORD("throw", Token::THROW) \
|
| + KEYWORD("true", Token::TRUE_LITERAL) \
|
| + KEYWORD("try", Token::TRY) \
|
| + KEYWORD("typeof", Token::TYPEOF) \
|
| + KEYWORD_GROUP('v') \
|
| + KEYWORD("var", Token::VAR) \
|
| + KEYWORD("void", Token::VOID) \
|
| + KEYWORD_GROUP('w') \
|
| + KEYWORD("while", Token::WHILE) \
|
| + KEYWORD("with", Token::WITH) \
|
| + KEYWORD_GROUP('y') \
|
| KEYWORD("yield", Token::YIELD)
|
|
|
|
|
|
|
Chromium Code Reviews
Issue 561913002:
Class syntax parsing (Closed)
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge