Changeset 38747 in webkit

Timestamp:

Nov 24, 2008 11:23:44 PM (15 years ago)

Author:

cwzwarich@webkit.org

Message:

2008-11-24 Cameron Zwarich <​zwarich@apple.com>

Reviewed by Geoff Garen.

Bug 13790: Function declarations are not treated as statements (used to affect starcraft2.com)
<​https://bugs.webkit.org/show_bug.cgi?id=13790>

Modify the parser to treat function declarations as statements,
simplifying the grammar in the process. Technically, according to the
grammar in the ECMA spec, function declarations are not statements and
can not be used everywhere that statements can, but it is not worth the
possibility compatibility issues just to stick to the spec in this case.

JavaScriptCore:

• parser/Grammar.y:
• parser/Nodes.cpp: (JSC::FuncDeclNode::emitBytecode): Avoid returning ignoredResult() as a result, because it causes a crash in DoWhileNode::emitBytecode().

LayoutTests:

• fast/js/function-declaration-statement-expected.txt: Added.
• fast/js/function-declaration-statement.html: Added.
• fast/js/resources/function-declaration-statement.js: Added.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/parser/Grammar.y (modified) (8 diffs)
• JavaScriptCore/parser/Nodes.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/function-declaration-statement-expected.txt (added)
• LayoutTests/fast/js/function-declaration-statement.html (added)
• LayoutTests/fast/js/resources/function-declaration-statement.js (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-24  Cameron Zwarich  <zwarich@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Bug 13790: Function declarations are not treated as statements (used to affect starcraft2.com)
+        <https://bugs.webkit.org/show_bug.cgi?id=13790>
+
+        Modify the parser to treat function declarations as statements,
+        simplifying the grammar in the process. Technically, according to the
+        grammar in the ECMA spec, function declarations are not statements and
+        can not be used everywhere that statements can, but it is not worth the
+        possibility compatibility issues just to stick to the spec in this case.
+
+        * parser/Grammar.y:
+        * parser/Nodes.cpp:
+        (JSC::FuncDeclNode::emitBytecode): Avoid returning ignoredResult()
+        as a result, because it causes a crash in DoWhileNode::emitBytecode().
+
 2008-11-24  Geoffrey Garen  <ggaren@apple.com>
 

trunk/JavaScriptCore/parser/Grammar.y

@@ -261 +261 @@
 %type <statementNode>   ThrowStatement TryStatement
 %type <statementNode>   DebuggerStatement
-%type <statementNode>   SourceElement
 
 %type <expressionNode>  Initializer InitializerNoIn
-%type <funcDeclNode>    FunctionDeclaration
+%type <statementNode>   FunctionDeclaration
 %type <funcExprNode>    FunctionExpr
 %type <functionBodyNode>  FunctionBody
@@ -797 +796 @@
   | VariableStatement
   | ConstStatement
+  | FunctionDeclaration
   | EmptyStatement
   | ExprStatement
@@ -1169 +1169 @@
 
 FunctionDeclaration:
-    FUNCTION IDENT '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeInfo(new FuncDeclNode(GLOBAL_DATA, *$2, $6, LEXER->sourceCode($5, $7, @5.first_line)), ((*$2 == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG($6, @5, @7); }
+    FUNCTION IDENT '(' ')' OPENBRACE FunctionBody CLOSEBRACE { $$ = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *$2, $6, LEXER->sourceCode($5, $7, @5.first_line)), 0, new ParserRefCountedData<DeclarationStacks::FunctionStack>(GLOBAL_DATA), ((*$2 == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | ClosureFeature, 0); DBG($6, @5, @7); $$.m_funcDeclarations->data.append(static_cast<FuncDeclNode*>($$.m_node)); }
   | FUNCTION IDENT '(' FormalParameterList ')' OPENBRACE FunctionBody CLOSEBRACE
       { 
-          $$ = createNodeInfo(new FuncDeclNode(GLOBAL_DATA, *$2, $7, LEXER->sourceCode($6, $8, @6.first_line), $4.m_node.head), ((*$2 == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | $4.m_features | ClosureFeature, 0); 
+          $$ = createNodeDeclarationInfo<StatementNode*>(new FuncDeclNode(GLOBAL_DATA, *$2, $7, LEXER->sourceCode($6, $8, @6.first_line), $4.m_node.head), 0, new ParserRefCountedData<DeclarationStacks::FunctionStack>(GLOBAL_DATA), ((*$2 == GLOBAL_DATA->propertyNames->arguments) ? ArgumentsFeature : 0) | $4.m_features | ClosureFeature, 0); 
           if ($4.m_features & ArgumentsFeature)
               $7->setUsesArguments(); 
-          DBG($7, @6, @8); 
+          DBG($7, @6, @8);
+          $$.m_funcDeclarations->data.append(static_cast<FuncDeclNode*>($$.m_node));
       }
 ;
@@ -1219 +1220 @@
 
 SourceElements:
-    SourceElement                       { $$.m_node = new SourceElements(GLOBAL_DATA);
+    Statement                           { $$.m_node = new SourceElements(GLOBAL_DATA);
                                           $$.m_node->append($1.m_node);
                                           $$.m_varDeclarations = $1.m_varDeclarations;
@@ -1226 +1227 @@
                                           $$.m_numConstants = $1.m_numConstants;
                                         }
-  | SourceElements SourceElement        { $$.m_node->append($2.m_node);
+  | SourceElements Statement            { $$.m_node->append($2.m_node);
                                           $$.m_varDeclarations = mergeDeclarationLists($1.m_varDeclarations, $2.m_varDeclarations);
                                           $$.m_funcDeclarations = mergeDeclarationLists($1.m_funcDeclarations, $2.m_funcDeclarations);
@@ -1232 +1233 @@
                                           $$.m_numConstants = $1.m_numConstants + $2.m_numConstants;
                                         }
-;
-
-SourceElement:
-    FunctionDeclaration                 { $$ = createNodeDeclarationInfo<StatementNode*>($1.m_node, 0, new ParserRefCountedData<DeclarationStacks::FunctionStack>(GLOBAL_DATA), $1.m_features, 0); $$.m_funcDeclarations->data.append($1.m_node); }
-  | Statement                           { $$ = $1; }
 ;
  
@@ -1627 +1623 @@
   | VariableStatement_NoNode
   | ConstStatement_NoNode
+  | FunctionDeclaration_NoNode
   | EmptyStatement_NoNode
   | ExprStatement_NoNode
@@ -1821 +1818 @@
 
 SourceElements_NoNode:
-    SourceElement_NoNode
-  | SourceElements_NoNode SourceElement_NoNode
-;
-
-SourceElement_NoNode:
-    FunctionDeclaration_NoNode
-  | Statement_NoNode
+    Statement_NoNode
+  | SourceElements_NoNode Statement_NoNode
 ;
 

trunk/JavaScriptCore/parser/Nodes.cpp

@@ -2633 +2633 @@
 RegisterID* FuncDeclNode::emitBytecode(BytecodeGenerator&, RegisterID* dst)
 {
+    if (dst == ignoredResult())
+        dst = 0;
     return dst;
 }

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-11-24  Cameron Zwarich  <zwarich@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        Add tests for bug 13790: Function declarations are not treated as statements (used to affect starcraft2.com)
+        <https://bugs.webkit.org/show_bug.cgi?id=13790>
+
+        * fast/js/function-declaration-statement-expected.txt: Added.
+        * fast/js/function-declaration-statement.html: Added.
+        * fast/js/resources/function-declaration-statement.js: Added.
+
 2008-11-24  Nikolas Zimmermann  <nikolas.zimmermann@torchmobile.com>