<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160383] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160383">160383</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2013-12-10 13:19:15 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce the mass templatizing of the JS parser
https://bugs.webkit.org/show_bug.cgi?id=125535
Reviewed by Michael Saboff.
The various caches we have now have removed the need for many of
the template vs. regular parameters. This patch converts those
template parameters to regular parameters and updates the call
sites. This reduces the code size of the parser by around 15%.
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createGetterOrSetterProperty):
(JSC::ASTBuilder::createProperty):
* parser/Parser.cpp:
(JSC::::parseInner):
(JSC::::parseSourceElements):
(JSC::::parseVarDeclarationList):
(JSC::::createBindingPattern):
(JSC::::tryParseDeconstructionPatternExpression):
(JSC::::parseDeconstructionPattern):
(JSC::::parseSwitchClauses):
(JSC::::parseSwitchDefaultClause):
(JSC::::parseBlockStatement):
(JSC::::parseFormalParameters):
(JSC::::parseFunctionInfo):
(JSC::::parseFunctionDeclaration):
(JSC::::parseProperty):
(JSC::::parseObjectLiteral):
(JSC::::parseStrictObjectLiteral):
(JSC::::parseMemberExpression):
* parser/Parser.h:
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::createProperty):
(JSC::SyntaxChecker::createGetterOrSetterProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160382 => 160383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-10 21:10:13 UTC (rev 160382)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-10 21:19:15 UTC (rev 160383)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2013-12-10 Oliver Hunt <oliver@apple.com>
+
+ Reduce the mass templatizing of the JS parser
+ https://bugs.webkit.org/show_bug.cgi?id=125535
+
+ Reviewed by Michael Saboff.
+
+ The various caches we have now have removed the need for many of
+ the template vs. regular parameters. This patch converts those
+ template parameters to regular parameters and updates the call
+ sites. This reduces the code size of the parser by around 15%.
+
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createGetterOrSetterProperty):
+ (JSC::ASTBuilder::createProperty):
+ * parser/Parser.cpp:
+ (JSC::::parseInner):
+ (JSC::::parseSourceElements):
+ (JSC::::parseVarDeclarationList):
+ (JSC::::createBindingPattern):
+ (JSC::::tryParseDeconstructionPatternExpression):
+ (JSC::::parseDeconstructionPattern):
+ (JSC::::parseSwitchClauses):
+ (JSC::::parseSwitchDefaultClause):
+ (JSC::::parseBlockStatement):
+ (JSC::::parseFormalParameters):
+ (JSC::::parseFunctionInfo):
+ (JSC::::parseFunctionDeclaration):
+ (JSC::::parseProperty):
+ (JSC::::parseObjectLiteral):
+ (JSC::::parseStrictObjectLiteral):
+ (JSC::::parseMemberExpression):
+ * parser/Parser.h:
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::createProperty):
+ (JSC::SyntaxChecker::createGetterOrSetterProperty):
+
</ins><span class="cx"> 2013-12-10 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT !heap.vm()->isInitializingObject() when finishing DFG compilation at beginning of GC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (160382 => 160383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2013-12-10 21:10:13 UTC (rev 160382)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2013-12-10 21:19:15 UTC (rev 160383)
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> body->setFunctionNameStart(functionNameStart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <bool> PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, const Identifier* name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn)
</del><ins>+ NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool, const Identifier* name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(name);
</span><span class="cx"> body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> return new (m_vm) PropertyNode(m_vm, *name, new (m_vm) FuncExprNode(location, m_vm->propertyNames->nullIdentifier, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn), params), type);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <bool> PropertyNode* createGetterOrSetterProperty(VM*, const JSTokenLocation& location, PropertyNode::Type type, double name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn)
</del><ins>+ NEVER_INLINE PropertyNode* createGetterOrSetterProperty(VM*, const JSTokenLocation& location, PropertyNode::Type type, bool, double name, ParameterNode* params, FunctionBodyNode* body, unsigned openBraceOffset, unsigned closeBraceOffset, int bodyStartLine, int bodyEndLine, unsigned bodyStartColumn)
</ins><span class="cx"> {
</span><span class="cx"> body->setLoc(bodyStartLine, bodyEndLine, location.startOffset, location.lineStartOffset);
</span><span class="cx"> return new (m_vm) PropertyNode(m_vm, name, new (m_vm) FuncExprNode(location, m_vm->propertyNames->nullIdentifier, body, m_sourceCode->subExpression(openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn), params), type);
</span><span class="lines">@@ -312,14 +312,14 @@
</span><span class="cx"> ArgumentListNode* createArgumentsList(const JSTokenLocation& location, ExpressionNode* arg) { return new (m_vm) ArgumentListNode(location, arg); }
</span><span class="cx"> ArgumentListNode* createArgumentsList(const JSTokenLocation& location, ArgumentListNode* args, ExpressionNode* arg) { return new (m_vm) ArgumentListNode(location, args, arg); }
</span><span class="cx">
</span><del>- template <bool> PropertyNode* createProperty(const Identifier* propertyName, ExpressionNode* node, PropertyNode::Type type)
</del><ins>+ PropertyNode* createProperty(const Identifier* propertyName, ExpressionNode* node, PropertyNode::Type type, bool)
</ins><span class="cx"> {
</span><span class="cx"> if (node->isFuncExprNode())
</span><span class="cx"> static_cast<FuncExprNode*>(node)->body()->setInferredName(*propertyName);
</span><span class="cx"> return new (m_vm) PropertyNode(m_vm, *propertyName, node, type);
</span><span class="cx"> }
</span><del>- template <bool> PropertyNode* createProperty(VM*, double propertyName, ExpressionNode* node, PropertyNode::Type type) { return new (m_vm) PropertyNode(m_vm, propertyName, node, type); }
- template <bool> PropertyNode* createProperty(VM*, ExpressionNode* propertyName, ExpressionNode* node, PropertyNode::Type type) { return new (m_vm) PropertyNode(m_vm, propertyName, node, type); }
</del><ins>+ PropertyNode* createProperty(VM*, double propertyName, ExpressionNode* node, PropertyNode::Type type, bool) { return new (m_vm) PropertyNode(m_vm, propertyName, node, type); }
+ PropertyNode* createProperty(VM*, ExpressionNode* propertyName, ExpressionNode* node, PropertyNode::Type type, bool) { return new (m_vm) PropertyNode(m_vm, propertyName, node, type); }
</ins><span class="cx"> PropertyListNode* createPropertyList(const JSTokenLocation& location, PropertyNode* property) { return new (m_vm) PropertyListNode(location, property); }
</span><span class="cx"> PropertyListNode* createPropertyList(const JSTokenLocation& location, PropertyNode* property, PropertyListNode* tail) { return new (m_vm) PropertyListNode(location, property, tail); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (160382 => 160383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2013-12-10 21:10:13 UTC (rev 160382)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2013-12-10 21:19:15 UTC (rev 160383)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> if (m_lexer->isReparsing())
</span><span class="cx"> m_statementDepth--;
</span><span class="cx"> ScopeRef scope = currentScope();
</span><del>- SourceElements* sourceElements = parseSourceElements<CheckForStrictMode>(context);
</del><ins>+ SourceElements* sourceElements = parseSourceElements(context, CheckForStrictMode);
</ins><span class="cx"> if (!sourceElements || !consume(EOFTOK)) {
</span><span class="cx"> if (hasError())
</span><span class="cx"> parseError = m_errorMessage;
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <SourceElementsMode mode, class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context)
</del><ins>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode)
</ins><span class="cx"> {
</span><span class="cx"> const unsigned lengthOfUseStrictLiteral = 12; // "use strict".length
</span><span class="cx"> TreeSourceElements sourceElements = context.createSourceElements();
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> lastIdent = 0;
</span><del>- auto pattern = parseDeconstructionPattern<DeconstructToVariables>(context);
</del><ins>+ auto pattern = parseDeconstructionPattern(context, DeconstructToVariables);
</ins><span class="cx"> failIfFalse(pattern, "Cannot parse this deconstruction pattern");
</span><span class="cx"> hasInitializer = match(EQUAL);
</span><span class="cx"> lastPattern = pattern;
</span><span class="lines">@@ -465,12 +465,12 @@
</span><span class="cx"> }
</span><span class="cx"> } while (match(COMMA));
</span><span class="cx"> if (lastIdent)
</span><del>- lastPattern = createBindingPattern<DeconstructToVariables>(context, *lastIdent, 0);
</del><ins>+ lastPattern = createBindingPattern(context, DeconstructToVariables, *lastIdent, 0);
</ins><span class="cx"> return varDecls;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::createBindingPattern(TreeBuilder& context, const Identifier& name, int depth)
</del><ins>+template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::createBindingPattern(TreeBuilder& context, DeconstructionKind kind, const Identifier& name, int depth)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!name.isEmpty());
</span><span class="cx"> ASSERT(!name.isNull());
</span><span class="lines">@@ -524,11 +524,11 @@
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::tryParseDeconstructionPatternExpression(TreeBuilder& context)
</span><span class="cx"> {
</span><del>- return parseDeconstructionPattern<DeconstructToExpressions>(context);
</del><ins>+ return parseDeconstructionPattern(context, DeconstructToExpressions);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <DeconstructionKind kind, class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::parseDeconstructionPattern(TreeBuilder& context, int depth)
</del><ins>+template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::parseDeconstructionPattern(TreeBuilder& context, DeconstructionKind kind, int depth)
</ins><span class="cx"> {
</span><span class="cx"> failIfStackOverflow();
</span><span class="cx"> int nonLHSCount = m_nonLHSCount;
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> }
</span><span class="cx"> propagateError();
</span><span class="cx"> JSTokenLocation location = m_token.m_location;
</span><del>- auto innerPattern = parseDeconstructionPattern<kind>(context, depth + 1);
</del><ins>+ auto innerPattern = parseDeconstructionPattern(context, kind, depth + 1);
</ins><span class="cx"> if (kind == DeconstructToExpressions && !innerPattern)
</span><span class="cx"> return 0;
</span><span class="cx"> failIfFalse(innerPattern, "Cannot parse this deconstruction pattern");
</span><span class="lines">@@ -578,9 +578,9 @@
</span><span class="cx"> propertyName = *m_token.m_data.ident;
</span><span class="cx"> next();
</span><span class="cx"> if (consume(COLON))
</span><del>- innerPattern = parseDeconstructionPattern<kind>(context, depth + 1);
</del><ins>+ innerPattern = parseDeconstructionPattern(context, kind, depth + 1);
</ins><span class="cx"> else
</span><del>- innerPattern = createBindingPattern<kind>(context, propertyName, depth);
</del><ins>+ innerPattern = createBindingPattern(context, kind, propertyName, depth);
</ins><span class="cx"> } else {
</span><span class="cx"> JSTokenType tokenType = m_token.m_type;
</span><span class="cx"> switch (m_token.m_type) {
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx">
</span><span class="cx"> failWithMessage("Expected a ':' prior to named property deconstruction");
</span><span class="cx"> }
</span><del>- innerPattern = parseDeconstructionPattern<kind>(context, depth + 1);
</del><ins>+ innerPattern = parseDeconstructionPattern(context, kind, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> if (kind == DeconstructToExpressions && !innerPattern)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> semanticFailureDueToKeyword("variable name");
</span><span class="cx"> failWithMessage("Expected a parameter pattern or a ')' in parameter list");
</span><span class="cx"> }
</span><del>- pattern = createBindingPattern<kind>(context, *m_token.m_data.ident, depth);
</del><ins>+ pattern = createBindingPattern(context, kind, *m_token.m_data.ident, depth);
</ins><span class="cx"> next();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -961,7 +961,7 @@
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Cannot parse switch clause");
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch clause expression");
</span><del>- TreeSourceElements statements = parseSourceElements<DontCheckForStrictMode>(context);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch clause");
</span><span class="cx"> TreeClause clause = context.createClause(condition, statements);
</span><span class="cx"> TreeClauseList clauseList = context.createClauseList(clause);
</span><span class="lines">@@ -972,7 +972,7 @@
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Cannot parse switch case expression");
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch clause expression");
</span><del>- TreeSourceElements statements = parseSourceElements<DontCheckForStrictMode>(context);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch clause");
</span><span class="cx"> clause = context.createClause(condition, statements);
</span><span class="cx"> tail = context.createClauseList(tail, clause);
</span><span class="lines">@@ -987,7 +987,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> next();
</span><span class="cx"> consumeOrFail(COLON, "Expected a ':' after switch default clause");
</span><del>- TreeSourceElements statements = parseSourceElements<DontCheckForStrictMode>(context);
</del><ins>+ TreeSourceElements statements = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(statements, "Cannot parse the body of a switch default clause");
</span><span class="cx"> return context.createClause(0, statements);
</span><span class="cx"> }
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx"> next();
</span><span class="cx"> return context.createBlockStatement(location, 0, start, m_lastTokenEndPosition.line);
</span><span class="cx"> }
</span><del>- TreeSourceElements subtree = parseSourceElements<DontCheckForStrictMode>(context);
</del><ins>+ TreeSourceElements subtree = parseSourceElements(context, DontCheckForStrictMode);
</ins><span class="cx"> failIfFalse(subtree, "Cannot parse the body of the block statement");
</span><span class="cx"> matchOrFail(CLOSEBRACE, "Expected a closing '}' at the end of a block statement");
</span><span class="cx"> next();
</span><span class="lines">@@ -1143,12 +1143,12 @@
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeFormalParameterList Parser<LexerType>::parseFormalParameters(TreeBuilder& context)
</span><span class="cx"> {
</span><del>- auto parameter = parseDeconstructionPattern<DeconstructToParameters>(context);
</del><ins>+ auto parameter = parseDeconstructionPattern(context, DeconstructToParameters);
</ins><span class="cx"> failIfFalse(parameter, "Cannot parse parameter pattern");
</span><span class="cx"> TreeFormalParameterList list = context.createFormalParameterList(parameter);
</span><span class="cx"> TreeFormalParameterList tail = list;
</span><span class="cx"> while (consume(COMMA)) {
</span><del>- parameter = parseDeconstructionPattern<DeconstructToParameters>(context);
</del><ins>+ parameter = parseDeconstructionPattern(context, DeconstructToParameters);
</ins><span class="cx"> failIfFalse(parameter, "Cannot parse parameter pattern");
</span><span class="cx"> tail = context.createFormalParameterList(tail, parameter);
</span><span class="cx"> }
</span><span class="lines">@@ -1169,7 +1169,7 @@
</span><span class="cx"> DepthManager statementDepth(&m_statementDepth);
</span><span class="cx"> m_statementDepth = 0;
</span><span class="cx"> typename TreeBuilder::FunctionBodyBuilder bodyBuilder(const_cast<VM*>(m_vm), m_lexer.get());
</span><del>- failIfFalse(parseSourceElements<CheckForStrictMode>(bodyBuilder), "Cannot parse body of this function");
</del><ins>+ failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode), "Cannot parse body of this function");
</ins><span class="cx"> unsigned endColumn = tokenColumn();
</span><span class="cx"> return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, strictMode());
</span><span class="cx"> }
</span><span class="lines">@@ -1189,7 +1189,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn)
</del><ins>+template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode, bool nameIsInContainingScope, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn)
</ins><span class="cx"> {
</span><span class="cx"> AutoPopScopeRef functionScope(this, pushScope());
</span><span class="cx"> functionScope->setIsFunction();
</span><span class="lines">@@ -1311,7 +1311,7 @@
</span><span class="cx"> unsigned closeBraceOffset = 0;
</span><span class="cx"> int bodyStartLine = 0;
</span><span class="cx"> unsigned bodyStartColumn = 0;
</span><del>- failIfFalse((parseFunctionInfo<FunctionNeedsName, FunctionMode, true>(context, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse this function");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNeedsName, FunctionMode, true, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse this function");
</ins><span class="cx"> failIfFalse(name, "Function statements must have a name");
</span><span class="cx"> failIfFalseIfStrict(declareVariable(name), "Cannot declare a function named '", name->impl(), "' in strict mode");
</span><span class="cx"> return context.createFuncDeclStatement(location, name, body, parameters, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
</span><span class="lines">@@ -1673,7 +1673,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <bool complete, class TreeBuilder> TreeProperty Parser<LexerType>::parseProperty(TreeBuilder& context)
</del><ins>+template <class TreeBuilder> TreeProperty Parser<LexerType>::parseProperty(TreeBuilder& context, bool complete)
</ins><span class="cx"> {
</span><span class="cx"> bool wasIdent = false;
</span><span class="cx"> switch (m_token.m_type) {
</span><span class="lines">@@ -1691,7 +1691,7 @@
</span><span class="cx"> next();
</span><span class="cx"> TreeExpression node = parseAssignmentExpression(context);
</span><span class="cx"> failIfFalse(node, "Cannot parse expression for property declaration");
</span><del>- return context.template createProperty<complete>(ident, node, PropertyNode::Constant);
</del><ins>+ return context.createProperty(ident, node, PropertyNode::Constant, complete);
</ins><span class="cx"> }
</span><span class="cx"> failIfFalse(wasIdent, "Expected an identifier as property name");
</span><span class="cx"> const Identifier* accessorName = 0;
</span><span class="lines">@@ -1720,14 +1720,14 @@
</span><span class="cx"> next();
</span><span class="cx"> if (type == PropertyNode::Getter) {
</span><span class="cx"> failIfFalse(match(OPENPAREN), "Expected a parameter list for getter definition");
</span><del>- failIfFalse((parseFunctionInfo<FunctionNoRequirements, GetterMode, false>(context, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse getter definition");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, GetterMode, false, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse getter definition");
</ins><span class="cx"> } else {
</span><span class="cx"> failIfFalse(match(OPENPAREN), "Expected a parameter list for setter definition");
</span><del>- failIfFalse((parseFunctionInfo<FunctionNoRequirements, SetterMode, false>(context, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse setter definition");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, SetterMode, false, accessorName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse setter definition");
</ins><span class="cx"> }
</span><span class="cx"> if (stringPropertyName)
</span><del>- return context.template createGetterOrSetterProperty<complete>(location, type, stringPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
- return context.template createGetterOrSetterProperty<complete>(const_cast<VM*>(m_vm), location, type, numericPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
</del><ins>+ return context.createGetterOrSetterProperty(location, type, complete, stringPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
+ return context.createGetterOrSetterProperty(const_cast<VM*>(m_vm), location, type, complete, numericPropertyName, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
</ins><span class="cx"> }
</span><span class="cx"> case NUMBER: {
</span><span class="cx"> double propertyName = m_token.m_data.doubleValue;
</span><span class="lines">@@ -1735,7 +1735,7 @@
</span><span class="cx"> consumeOrFail(COLON, "Expected ':' after property name");
</span><span class="cx"> TreeExpression node = parseAssignmentExpression(context);
</span><span class="cx"> failIfFalse(node, "Cannot parse expression for property declaration");
</span><del>- return context.template createProperty<complete>(const_cast<VM*>(m_vm), propertyName, node, PropertyNode::Constant);
</del><ins>+ return context.createProperty(const_cast<VM*>(m_vm), propertyName, node, PropertyNode::Constant, complete);
</ins><span class="cx"> }
</span><span class="cx"> case OPENBRACKET: {
</span><span class="cx"> next();
</span><span class="lines">@@ -1746,7 +1746,7 @@
</span><span class="cx"> consumeOrFail(COLON, "Expected ':' after property name");
</span><span class="cx"> TreeExpression node = parseAssignmentExpression(context);
</span><span class="cx"> failIfFalse(node, "Cannot parse expression for property declaration");
</span><del>- return context.template createProperty<complete>(const_cast<VM*>(m_vm), propertyName, node, PropertyNode::Constant);
</del><ins>+ return context.createProperty(const_cast<VM*>(m_vm), propertyName, node, PropertyNode::Constant, complete);
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> failIfFalse(m_token.m_type & KeywordTokenFlag, "Expected a property name");
</span><span class="lines">@@ -1768,7 +1768,7 @@
</span><span class="cx"> return context.createObjectLiteral(location);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TreeProperty property = parseProperty<false>(context);
</del><ins>+ TreeProperty property = parseProperty(context, false);
</ins><span class="cx"> failIfFalse(property, "Cannot parse object literal property");
</span><span class="cx"> if (!m_syntaxAlreadyValidated && context.getType(property) != PropertyNode::Constant) {
</span><span class="cx"> restoreSavePoint(savePoint);
</span><span class="lines">@@ -1782,7 +1782,7 @@
</span><span class="cx"> if (match(CLOSEBRACE))
</span><span class="cx"> break;
</span><span class="cx"> JSTokenLocation propertyLocation(tokenLocation());
</span><del>- property = parseProperty<false>(context);
</del><ins>+ property = parseProperty(context, false);
</ins><span class="cx"> failIfFalse(property, "Cannot parse object literal property");
</span><span class="cx"> if (!m_syntaxAlreadyValidated && context.getType(property) != PropertyNode::Constant) {
</span><span class="cx"> restoreSavePoint(savePoint);
</span><span class="lines">@@ -1812,7 +1812,7 @@
</span><span class="cx"> return context.createObjectLiteral(location);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- TreeProperty property = parseProperty<true>(context);
</del><ins>+ TreeProperty property = parseProperty(context, true);
</ins><span class="cx"> failIfFalse(property, "Cannot parse object literal property");
</span><span class="cx">
</span><span class="cx"> typedef HashMap<RefPtr<StringImpl>, unsigned, IdentifierRepHash> ObjectValidationMap;
</span><span class="lines">@@ -1829,7 +1829,7 @@
</span><span class="cx"> if (match(CLOSEBRACE))
</span><span class="cx"> break;
</span><span class="cx"> JSTokenLocation propertyLocation(tokenLocation());
</span><del>- property = parseProperty<true>(context);
</del><ins>+ property = parseProperty(context, true);
</ins><span class="cx"> failIfFalse(property, "Cannot parse object literal property");
</span><span class="cx"> if (!m_syntaxAlreadyValidated && context.getName(property)) {
</span><span class="cx"> ObjectValidationMap::AddResult propertyEntry = objectValidator.add(context.getName(property)->impl(), context.getType(property));
</span><span class="lines">@@ -2076,7 +2076,7 @@
</span><span class="cx"> unsigned bodyStartColumn = 0;
</span><span class="cx"> location = tokenLocation();
</span><span class="cx"> next();
</span><del>- failIfFalse((parseFunctionInfo<FunctionNoRequirements, FunctionMode, false>(context, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse function expression");
</del><ins>+ failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, false, name, parameters, body, openBraceOffset, closeBraceOffset, bodyStartLine, bodyStartColumn)), "Cannot parse function expression");
</ins><span class="cx"> base = context.createFunctionExpr(location, name, body, parameters, openBraceOffset, closeBraceOffset, bodyStartLine, m_lastTokenEndPosition.line, bodyStartColumn);
</span><span class="cx"> } else
</span><span class="cx"> base = parsePrimaryExpression(context);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (160382 => 160383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2013-12-10 21:10:13 UTC (rev 160382)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2013-12-10 21:19:15 UTC (rev 160383)
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template <SourceElementsMode mode, class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode);
</ins><span class="cx"> template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseFunctionDeclaration(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseVarDeclaration(TreeBuilder&);
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseExpressionStatement(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseExpressionOrLabelStatement(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseIfStatement(TreeBuilder&);
</span><del>- template <class TreeBuilder> ALWAYS_INLINE TreeStatement parseBlockStatement(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> TreeStatement parseBlockStatement(TreeBuilder&);
</ins><span class="cx"> template <class TreeBuilder> TreeExpression parseExpression(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeExpression parseAssignmentExpression(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseConditionalExpression(TreeBuilder&);
</span><span class="lines">@@ -730,19 +730,19 @@
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parsePrimaryExpression(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseArrayLiteral(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseObjectLiteral(TreeBuilder&);
</span><del>- template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseStrictObjectLiteral(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> NEVER_INLINE TreeExpression parseStrictObjectLiteral(TreeBuilder&);
</ins><span class="cx"> enum SpreadMode { AllowSpread, DontAllowSpread };
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeArguments parseArguments(TreeBuilder&, SpreadMode);
</span><del>- template <bool strict, class TreeBuilder> ALWAYS_INLINE TreeProperty parseProperty(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> TreeProperty parseProperty(TreeBuilder&, bool strict);
</ins><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
</span><del>- template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd);
- template <class TreeBuilder> ALWAYS_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
</del><ins>+ template <class TreeBuilder> TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd);
+ template <class TreeBuilder> NEVER_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
</ins><span class="cx">
</span><del>- template <DeconstructionKind, class TreeBuilder> ALWAYS_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, const Identifier&, int depth);
- template <DeconstructionKind, class TreeBuilder> TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, int depth = 0);
</del><ins>+ template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, DeconstructionKind, const Identifier&, int depth);
+ template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, DeconstructionKind, int depth = 0);
</ins><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern tryParseDeconstructionPatternExpression(TreeBuilder&);
</span><del>- template <FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, class TreeBuilder> bool parseFunctionInfo(TreeBuilder&, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn);
</del><ins>+ template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, unsigned& openBraceOffset, unsigned& closeBraceOffset, int& bodyStartLine, unsigned& bodyStartColumn);
</ins><span class="cx"> ALWAYS_INLINE int isBinaryOperator(JSTokenType);
</span><span class="cx"> bool allowAutomaticSemicolon();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (160382 => 160383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2013-12-10 21:10:13 UTC (rev 160382)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2013-12-10 21:19:15 UTC (rev 160383)
</span><span class="lines">@@ -160,20 +160,20 @@
</span><span class="cx"> ExpressionType createSpreadExpression(const JSTokenLocation&, ExpressionType, int, int, int) { return 1; }
</span><span class="cx"> int createArgumentsList(const JSTokenLocation&, int) { return 1; }
</span><span class="cx"> int createArgumentsList(const JSTokenLocation&, int, int) { return 1; }
</span><del>- template <bool complete> Property createProperty(const Identifier* name, int, PropertyNode::Type type)
</del><ins>+ Property createProperty(const Identifier* name, int, PropertyNode::Type type, bool complete)
</ins><span class="cx"> {
</span><span class="cx"> if (!complete)
</span><span class="cx"> return Property(type);
</span><span class="cx"> ASSERT(name);
</span><span class="cx"> return Property(name, type);
</span><span class="cx"> }
</span><del>- template <bool complete> Property createProperty(VM* vm, double name, int, PropertyNode::Type type)
</del><ins>+ Property createProperty(VM* vm, double name, int, PropertyNode::Type type, bool complete)
</ins><span class="cx"> {
</span><span class="cx"> if (!complete)
</span><span class="cx"> return Property(type);
</span><span class="cx"> return Property(&vm->parserArena->identifierArena().makeNumericIdentifier(vm, name), type);
</span><span class="cx"> }
</span><del>- template <bool complete> Property createProperty(VM*, ExpressionNode*, int, PropertyNode::Type type)
</del><ins>+ Property createProperty(VM*, ExpressionNode*, int, PropertyNode::Type type, bool)
</ins><span class="cx"> {
</span><span class="cx"> return Property(type);
</span><span class="cx"> }
</span><span class="lines">@@ -212,14 +212,14 @@
</span><span class="cx"> int createDebugger(const JSTokenLocation&, int, int) { return 1; }
</span><span class="cx"> int createConstStatement(const JSTokenLocation&, int, int, int) { return 1; }
</span><span class="cx"> int appendConstDecl(const JSTokenLocation&, int, const Identifier*, int) { return 1; }
</span><del>- template <bool strict> Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, const Identifier* name, int, int, int, int, int, int, int)
</del><ins>+ Property createGetterOrSetterProperty(const JSTokenLocation&, PropertyNode::Type type, bool strict, const Identifier* name, int, int, int, int, int, int, int)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(name);
</span><span class="cx"> if (!strict)
</span><span class="cx"> return Property(type);
</span><span class="cx"> return Property(name, type);
</span><span class="cx"> }
</span><del>- template <bool strict> Property createGetterOrSetterProperty(VM* vm, const JSTokenLocation&, PropertyNode::Type type, double name, int, int, int, int, int, int, int)
</del><ins>+ Property createGetterOrSetterProperty(VM* vm, const JSTokenLocation&, PropertyNode::Type type, bool strict, double name, int, int, int, int, int, int, int)
</ins><span class="cx"> {
</span><span class="cx"> if (!strict)
</span><span class="cx"> return Property(type);
</span></span></pre>
</div>
</div>
</body>
</html>