Changeset 99618 in webkit for trunk/Source/JavaScriptCore/parser/Parser.cpp

Timestamp:

Nov 8, 2011, 2:49:27 PM (14 years ago)

Author:

[email protected]

Message:

Towards 8 Bit Strings: Templatize JSC::Parser class by Lexer type
​https://bugs.webkit.org/show_bug.cgi?id=71761

Source/JavaScriptCore:

Templatized Parser based on Lexer<T>. Moved two enums,
SourceElementsMode and FunctionRequirements out of Parser definition
to work around a clang compiler defect.

Cleaned up SourceCode data() to return StringImpl* and eliminated
the recently added stringData() virtual method.

To keep code in Parser.cpp and keep Parser.h small, the two flavors
of Parser are explicitly instantiated at the end of Parser.cpp.

Reviewed by Gavin Barraclough.

• interpreter/Interpreter.cpp:

(JSC::appendSourceToError):

• parser/Lexer.cpp:

(JSC::::setCode):
(JSC::::sourceCode):

• parser/Parser.cpp:

(JSC::::Parser):
(JSC::::~Parser):
(JSC::::parseInner):
(JSC::::didFinishParsing):
(JSC::::allowAutomaticSemicolon):
(JSC::::parseSourceElements):
(JSC::::parseVarDeclaration):
(JSC::::parseConstDeclaration):
(JSC::::parseDoWhileStatement):
(JSC::::parseWhileStatement):
(JSC::::parseVarDeclarationList):
(JSC::::parseConstDeclarationList):
(JSC::::parseForStatement):
(JSC::::parseBreakStatement):
(JSC::::parseContinueStatement):
(JSC::::parseReturnStatement):
(JSC::::parseThrowStatement):
(JSC::::parseWithStatement):
(JSC::::parseSwitchStatement):
(JSC::::parseSwitchClauses):
(JSC::::parseSwitchDefaultClause):
(JSC::::parseTryStatement):
(JSC::::parseDebuggerStatement):
(JSC::::parseBlockStatement):
(JSC::::parseStatement):
(JSC::::parseFormalParameters):
(JSC::::parseFunctionBody):
(JSC::::parseFunctionInfo):
(JSC::::parseFunctionDeclaration):
(JSC::::parseExpressionOrLabelStatement):
(JSC::::parseExpressionStatement):
(JSC::::parseIfStatement):
(JSC::::parseExpression):
(JSC::::parseAssignmentExpression):
(JSC::::parseConditionalExpression):
(JSC::::isBinaryOperator):
(JSC::::parseBinaryExpression):
(JSC::::parseProperty):
(JSC::::parseObjectLiteral):
(JSC::::parseStrictObjectLiteral):
(JSC::::parseArrayLiteral):
(JSC::::parsePrimaryExpression):
(JSC::::parseArguments):
(JSC::::parseMemberExpression):
(JSC::::parseUnaryExpression):

• parser/Parser.h:

(JSC::::parse):
(JSC::parse):

• parser/SourceCode.h:

(JSC::SourceCode::data):
(JSC::SourceCode::subExpression):

• parser/SourceProvider.h:

(JSC::UStringSourceProvider::data):

Source/WebCore:

Cleaned up SourceCode data() to return StringImpl* and eliminated
the recently added stringData() virtual method.

No tests added - refactored base class SourceCode and its subclasses.

• bindings/js/CachedScriptSourceProvider.h:

(WebCore::CachedScriptSourceProvider::data):

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::dispatchDidParseSource):
(WebCore::ScriptDebugServer::dispatchFailedToParseSource):

• bindings/js/StringSourceProvider.h:

(WebCore::StringSourceProvider::data):

Source/WebKit/mac:

Changed WKPCEvaluate() to use emptyString() when the source is
zero length.

Reviewed by Gavin Barraclough.

• Plugins/Hosted/NetscapePluginHostProxy.mm:

(WKPCEvaluate):

File:

• trunk/Source/JavaScriptCore/parser/Parser.cpp (modified) (45 diffs)

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -41 +41 @@
 namespace JSC {
 
-Parser::Parser(JSGlobalData* globalData, const SourceCode& source, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode parserMode)
+template <typename LexerType>
+Parser<LexerType>::Parser(JSGlobalData* globalData, const SourceCode& source, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode parserMode)
     : m_globalData(globalData)
     , m_source(&source)
@@ -58 +59 @@
     , m_sourceElements(0)
 {
-    m_lexer = adoptPtr(new Lexer<UChar>(globalData));
+    m_lexer = adoptPtr(new LexerType(globalData));
     m_arena = m_globalData->parserArena;
     m_lexer->setCode(source, m_arena);
@@ -76 +77 @@
 }
 
-Parser::~Parser()
-{
-}
-
-
-UString Parser::parseInner()
+template <typename LexerType>
+Parser<LexerType>::~Parser()
+{
+}
+
+template <typename LexerType>
+UString Parser<LexerType>::parseInner()
 {
     UString parseError = UString();
@@ -111 +113 @@
 }
 
-void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, 
+template <typename LexerType>
+void Parser<LexerType>::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, 
                               ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants, IdentifierSet& capturedVars)
 {
@@ -123 +126 @@
 }
 
-bool Parser::allowAutomaticSemicolon()
+template <typename LexerType>
+bool Parser<LexerType>::allowAutomaticSemicolon()
 {
     return match(CLOSEBRACE) || match(EOFTOK) || m_lexer->prevTerminator();
 }
 
-template <Parser::SourceElementsMode mode, class TreeBuilder> TreeSourceElements Parser::parseSourceElements(TreeBuilder& context)
+template <typename LexerType>
+template <SourceElementsMode mode, class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context)
 {
     const unsigned lengthOfUseStrictLiteral = 12; // "use strict".length
@@ -165 +170 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseVarDeclaration(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseVarDeclaration(TreeBuilder& context)
 {
     ASSERT(match(VAR));
@@ -181 +187 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseConstDeclaration(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseConstDeclaration(TreeBuilder& context)
 {
     ASSERT(match(CONSTTOKEN));
@@ -193 +200 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseDoWhileStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseDoWhileStatement(TreeBuilder& context)
 {
     ASSERT(match(DO));
@@ -214 +222 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseWhileStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseWhileStatement(TreeBuilder& context)
 {
     ASSERT(match(WHILE));
@@ -232 +241 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseVarDeclarationList(TreeBuilder& context, int& declarations, const Identifier*& lastIdent, TreeExpression& lastInitializer, int& identStart, int& initStart, int& initEnd)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseVarDeclarationList(TreeBuilder& context, int& declarations, const Identifier*& lastIdent, TreeExpression& lastInitializer, int& identStart, int& initStart, int& initEnd)
 {
     TreeExpression varDecls = 0;
@@ -268 +278 @@
 }
 
-template <class TreeBuilder> TreeConstDeclList Parser::parseConstDeclarationList(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeConstDeclList Parser<LexerType>::parseConstDeclarationList(TreeBuilder& context)
 {
     failIfTrue(strictMode());
@@ -293 +304 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseForStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseForStatement(TreeBuilder& context)
 {
     ASSERT(match(FOR));
@@ -401 +413 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseBreakStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseBreakStatement(TreeBuilder& context)
 {
     ASSERT(match(BREAK));
@@ -424 +437 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseContinueStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseContinueStatement(TreeBuilder& context)
 {
     ASSERT(match(CONTINUE));
@@ -449 +463 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseReturnStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseReturnStatement(TreeBuilder& context)
 {
     ASSERT(match(RETURN));
@@ -474 +489 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseThrowStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseThrowStatement(TreeBuilder& context)
 {
     ASSERT(match(THROW));
@@ -492 +508 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseWithStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseWithStatement(TreeBuilder& context)
 {
     ASSERT(match(WITH));
@@ -514 +531 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseSwitchStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseSwitchStatement(TreeBuilder& context)
 {
     ASSERT(match(SWITCH));
@@ -541 +559 @@
 }
 
-template <class TreeBuilder> TreeClauseList Parser::parseSwitchClauses(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeClauseList Parser<LexerType>::parseSwitchClauses(TreeBuilder& context)
 {
     if (!match(CASE))
@@ -568 +587 @@
 }
 
-template <class TreeBuilder> TreeClause Parser::parseSwitchDefaultClause(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeClause Parser<LexerType>::parseSwitchDefaultClause(TreeBuilder& context)
 {
     if (!match(DEFAULT))
@@ -579 +599 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseTryStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseTryStatement(TreeBuilder& context)
 {
     ASSERT(match(TRY));
@@ -624 +645 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseDebuggerStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseDebuggerStatement(TreeBuilder& context)
 {
     ASSERT(match(DEBUGGER));
@@ -636 +658 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseBlockStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseBlockStatement(TreeBuilder& context)
 {
     ASSERT(match(OPENBRACE));
@@ -652 +675 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength)
 {
     DepthManager statementDepth(&m_statementDepth);
@@ -717 +741 @@
 }
 
-template <class TreeBuilder> TreeFormalParameterList Parser::parseFormalParameters(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeFormalParameterList Parser<LexerType>::parseFormalParameters(TreeBuilder& context)
 {
     matchOrFail(IDENT);
@@ -735 +760 @@
 }
 
-template <class TreeBuilder> TreeFunctionBody Parser::parseFunctionBody(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseFunctionBody(TreeBuilder& context)
 {
     if (match(CLOSEBRACE))
@@ -746 +772 @@
 }
 
-template <Parser::FunctionRequirements requirements, bool nameIsInContainingScope, class TreeBuilder> bool Parser::parseFunctionInfo(TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, int& openBracePos, int& closeBracePos, int& bodyStartLine)
+template <typename LexerType>
+template <FunctionRequirements requirements, bool nameIsInContainingScope, class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, int& openBracePos, int& closeBracePos, int& bodyStartLine)
 {
     AutoPopScopeRef functionScope(this, pushScope());
@@ -819 +846 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseFunctionDeclaration(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseFunctionDeclaration(TreeBuilder& context)
 {
     ASSERT(match(FUNCTION));
@@ -848 +876 @@
 };
 
-template <class TreeBuilder> TreeStatement Parser::parseExpressionOrLabelStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseExpressionOrLabelStatement(TreeBuilder& context)
 {
     
@@ -910 +939 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseExpressionStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseExpressionStatement(TreeBuilder& context)
 {
     int startLine = tokenLine();
@@ -919 +949 @@
 }
 
-template <class TreeBuilder> TreeStatement Parser::parseIfStatement(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseIfStatement(TreeBuilder& context)
 {
     ASSERT(match(IF));
@@ -996 +1027 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseExpression(TreeBuilder& context)
 {
     failIfStackOverflow();
@@ -1018 +1050 @@
 }
 
-
-template <typename TreeBuilder> TreeExpression Parser::parseAssignmentExpression(TreeBuilder& context)
+template <typename LexerType>
+template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmentExpression(TreeBuilder& context)
 {
     failIfStackOverflow();
@@ -1080 +1112 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseConditionalExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseConditionalExpression(TreeBuilder& context)
 {
     TreeExpression cond = parseBinaryExpression(context);
@@ -1102 +1135 @@
 }
 
-int Parser::isBinaryOperator(JSTokenType token)
+template <typename LexerType>
+int Parser<LexerType>::isBinaryOperator(JSTokenType token)
 {
     if (m_allowsIn)
@@ -1109 +1143 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseBinaryExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseBinaryExpression(TreeBuilder& context)
 {
     
@@ -1153 +1188 @@
 }
 
-
-template <bool complete, class TreeBuilder> TreeProperty Parser::parseProperty(TreeBuilder& context)
+template <typename LexerType>
+template <bool complete, class TreeBuilder> TreeProperty Parser<LexerType>::parseProperty(TreeBuilder& context)
 {
     bool wasIdent = false;
@@ -1206 +1241 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseObjectLiteral(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseObjectLiteral(TreeBuilder& context)
 {
     int startOffset = m_token.m_data.intValue;
@@ -1245 +1281 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseStrictObjectLiteral(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseStrictObjectLiteral(TreeBuilder& context)
 {
     consumeOrFail(OPENBRACE);
@@ -1289 +1326 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseArrayLiteral(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrayLiteral(TreeBuilder& context)
 {
     consumeOrFailWithFlags(OPENBRACKET, TreeBuilder::DontBuildStrings);
@@ -1331 +1369 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parsePrimaryExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePrimaryExpression(TreeBuilder& context)
 {
     failIfStackOverflow();
@@ -1409 +1448 @@
 }
 
-template <class TreeBuilder> TreeArguments Parser::parseArguments(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeArguments Parser<LexerType>::parseArguments(TreeBuilder& context)
 {
     consumeOrFailWithFlags(OPENPAREN, TreeBuilder::DontBuildStrings);
@@ -1431 +1471 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseMemberExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseMemberExpression(TreeBuilder& context)
 {
     TreeExpression base = 0;
@@ -1511 +1552 @@
 }
 
-template <class TreeBuilder> TreeExpression Parser::parseUnaryExpression(TreeBuilder& context)
+template <typename LexerType>
+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseUnaryExpression(TreeBuilder& context)
 {
     typename TreeBuilder::UnaryExprContext unaryExprContext(context);
@@ -1624 +1666 @@
 }
 
+// Instantiate the two flavors of Parser we need instead of putting most of this file in Parser.h
+template class Parser< Lexer<LChar> >;
+template class Parser< Lexer<UChar> >;
+
 } // namespace JSC