Changeset 63024 in webkit for trunk/JavaScriptCore/parser/Lexer.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/Lexer.h (modified) (3 diffs)

trunk/JavaScriptCore/parser/Lexer.h

@@ -24 +24 @@
 #define Lexer_h
 
+#include "JSParser.h"
 #include "Lookup.h"
 #include "ParserArena.h"
@@ -35 +36 @@
 namespace JSC {
 
-    union JSTokenData;
-    struct JSTokenInfo;
     class RegExp;
 
@@ -52 +51 @@
 
         // Functions for the parser itself.
-        int lex(JSTokenData* lvalp, JSTokenInfo* llocp);
+        JSTokenType lex(JSTokenData* lvalp, JSTokenInfo* llocp);
         int lineNumber() const { return m_lineNumber; }
         void setLastLineNumber(int lastLineNumber) { m_lastLineNumber = lastLineNumber; }