Changeset 63024 in webkit for trunk/JavaScriptCore/parser/ASTBuilder.h

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:

• trunk/JavaScriptCore/parser/ASTBuilder.h (modified) (3 diffs)

trunk/JavaScriptCore/parser/ASTBuilder.h

@@ -763 +763 @@
         return new (m_globalData) LogicalOpNode(m_globalData, lhs.first, rhs.first, OpLogicalAnd);
 
-    case '|':
+    case BITOR:
         return new (m_globalData) BitOrNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '^':
+    case BITXOR:
         return new (m_globalData) BitXOrNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '&':
+    case BITAND:
         return new (m_globalData) BitAndNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
@@ -784 +784 @@
         return new (m_globalData) NotStrictEqualNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '<':
+    case LT:
         return new (m_globalData) LessNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '>':
+    case GT:
         return new (m_globalData) GreaterNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
@@ -817 +817 @@
         return new (m_globalData) UnsignedRightShiftNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '+':
+    case PLUS:
         return makeAddNode(lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '-':
+    case MINUS:
         return makeSubNode(lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '*':
+    case TIMES:
         return makeMultNode(lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '/':
+    case DIVIDE:
         return makeDivNode(lhs.first, rhs.first, rhs.second.hasAssignment);
 
-    case '%':
+    case MOD:
         return new (m_globalData) ModNode(m_globalData, lhs.first, rhs.first, rhs.second.hasAssignment);
     }