Ignore:
Timestamp:
Jul 9, 2010, 6:25:50 PM (15 years ago)
Author:
[email protected]
Message:

Tidy up lexer token ids
​https://bugs.webkit.org/show_bug.cgi?id=42014

Reviewed by Darin Adler

Stop using character literals to identify single character tokens
and instead use symbolic names for all tokens.

  • parser/ASTBuilder.h:

(JSC::ASTBuilder::makeBinaryNode):

  • parser/JSParser.cpp:

(JSC::JSParser::consume):
(JSC::JSParser::match):
(JSC::JSParser::autoSemiColon):
(JSC::JSParser::JSParser):
(JSC::JSParser::parseProgram):
(JSC::JSParser::allowAutomaticSemicolon):
(JSC::JSParser::parseDoWhileStatement):
(JSC::JSParser::parseWhileStatement):
(JSC::JSParser::parseVarDeclarationList):
(JSC::JSParser::parseConstDeclarationList):
(JSC::JSParser::parseForStatement):
(JSC::JSParser::parseReturnStatement):
(JSC::JSParser::parseWithStatement):
(JSC::JSParser::parseSwitchStatement):
(JSC::JSParser::parseSwitchClauses):
(JSC::JSParser::parseSwitchDefaultClause):
(JSC::JSParser::parseTryStatement):
(JSC::JSParser::parseDebuggerStatement):
(JSC::JSParser::parseStatement):
(JSC::JSParser::parseFormalParameters):
(JSC::JSParser::parseFunctionInfo):
(JSC::JSParser::parseExpressionOrLabelStatement):
(JSC::JSParser::parseIfStatement):
(JSC::JSParser::parseExpression):
(JSC::JSParser::parseAssignmentExpression):
(JSC::JSParser::parseConditionalExpression):
(JSC::isUnaryOp):
(JSC::JSParser::isBinaryOperator):
(JSC::JSParser::parseBinaryExpression):
(JSC::JSParser::parseProperty):
(JSC::JSParser::parseObjectLiteral):
(JSC::JSParser::parseStrictObjectLiteral):
(JSC::JSParser::parseArrayLiteral):
(JSC::JSParser::parsePrimaryExpression):
(JSC::JSParser::parseArguments):
(JSC::JSParser::parseMemberExpression):
(JSC::JSParser::parseUnaryExpression):

  • parser/JSParser.h:

(JSC::):

  • parser/Lexer.cpp:

(JSC::):
(JSC::Lexer::lex):

  • parser/Lexer.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/parser/JSParser.h

    r62995 r63024  
    3434
    3535enum JSTokenType {
    36     NULLTOKEN = 258,
    37     TRUETOKEN = 259,
    38     FALSETOKEN = 260,
    39     BREAK = 261,
    40     CASE = 262,
    41     DEFAULT = 263,
    42     FOR = 264,
    43     NEW = 265,
    44     VAR = 266,
    45     CONSTTOKEN = 267,
    46     CONTINUE = 268,
    47     FUNCTION = 269,
    48     RETURN = 270,
    49     VOIDTOKEN = 271,
    50     DELETETOKEN = 272,
    51     IF = 273,
    52     THISTOKEN = 274,
    53     DO = 275,
    54     WHILE = 276,
    55     INTOKEN = 277,
    56     INSTANCEOF = 278,
    57     TYPEOF = 279,
    58     SWITCH = 280,
    59     WITH = 281,
    60     RESERVED = 282,
    61     THROW = 283,
    62     TRY = 284,
    63     CATCH = 285,
    64     FINALLY = 286,
    65     DEBUGGER = 287,
    66     IF_WITHOUT_ELSE = 288,
    67     ELSE = 289,
    68     EQEQ = 290,
    69     NE = 291,
    70     STREQ = 292,
    71     STRNEQ = 293,
    72     LE = 294,
    73     GE = 295,
    74     OR = 296,
    75     AND = 297,
    76     PLUSPLUS = 298,
    77     MINUSMINUS = 299,
    78     LSHIFT = 300,
    79     RSHIFT = 301,
    80     URSHIFT = 302,
    81     PLUSEQUAL = 303,
    82     MINUSEQUAL = 304,
    83     MULTEQUAL = 305,
    84     DIVEQUAL = 306,
    85     LSHIFTEQUAL = 307,
    86     RSHIFTEQUAL = 308,
    87     URSHIFTEQUAL = 309,
    88     ANDEQUAL = 310,
    89     MODEQUAL = 311,
    90     XOREQUAL = 312,
    91     OREQUAL = 313,
    92     OPENBRACE = 314,
    93     CLOSEBRACE = 315,
    94     NUMBER = 316,
    95     IDENT = 317,
    96     STRING = 318,
    97     AUTOPLUSPLUS = 319,
    98     AUTOMINUSMINUS = 320
     36    NULLTOKEN,
     37    TRUETOKEN,
     38    FALSETOKEN,
     39    BREAK,
     40    CASE,
     41    DEFAULT,
     42    FOR,
     43    NEW,
     44    VAR,
     45    CONSTTOKEN,
     46    CONTINUE,
     47    FUNCTION,
     48    RETURN,
     49    VOIDTOKEN,
     50    DELETETOKEN,
     51    IF,
     52    THISTOKEN,
     53    DO,
     54    WHILE,
     55    INTOKEN,
     56    INSTANCEOF,
     57    TYPEOF,
     58    SWITCH,
     59    WITH,
     60    RESERVED,
     61    THROW,
     62    TRY,
     63    CATCH,
     64    FINALLY,
     65    DEBUGGER,
     66    IF_WITHOUT_ELSE,
     67    ELSE,
     68    EQUAL,
     69    EQEQ,
     70    NE,
     71    STREQ,
     72    STRNEQ,
     73    LT,
     74    GT,
     75    LE,
     76    GE,
     77    OR,
     78    AND,
     79    PLUSPLUS,
     80    MINUSMINUS,
     81    LSHIFT,
     82    RSHIFT,
     83    URSHIFT,
     84    PLUSEQUAL,
     85    MINUSEQUAL,
     86    MULTEQUAL,
     87    DIVEQUAL,
     88    LSHIFTEQUAL,
     89    RSHIFTEQUAL,
     90    URSHIFTEQUAL,
     91    ANDEQUAL,
     92    MODEQUAL,
     93    XOREQUAL,
     94    OREQUAL,
     95    BITOR,
     96    BITAND,
     97    BITXOR,
     98    PLUS,
     99    MINUS,
     100    TIMES,
     101    DIVIDE,
     102    MOD,
     103    OPENBRACE,
     104    CLOSEBRACE,
     105    OPENPAREN,
     106    CLOSEPAREN,
     107    OPENBRACKET,
     108    CLOSEBRACKET,
     109    COMMA,
     110    QUESTION,
     111    TILDE,
     112    EXCLAMATION,
     113    NUMBER,
     114    IDENT,
     115    STRING,
     116    AUTOPLUSPLUS,
     117    AUTOMINUSMINUS,
     118    SEMICOLON,
     119    COLON,
     120    DOT,
     121    ERRORTOK,
     122    EOFTOK
    99123};
    100124
    … …  
    113137
    114138struct JSToken {
    115     int m_type;
     139    JSTokenType m_type;
    116140    JSTokenData m_data;
    117141    JSTokenInfo m_info;
Note: See TracChangeset for help on using the changeset viewer.