Changeset 10416 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 31, 2005, 11:36:47 AM (20 years ago)

Author:

ggaren

Message:

-rolled in fix for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4698
kjs does not allow named functions in function expressions

Fix by Arthur Langereis.

Reviewed by darin.

• kjs/grammar.y:
• kjs/nodes.cpp: (FuncExprNode::evaluate):
• kjs/nodes.h: (KJS::FuncExprNode::FuncExprNode):

Test cases added:

• layout-tests/fast/js/named-function-expression-expected.txt: Added.
• layout-tests/fast/js/named-function-expression.html: Added.

Location:

trunk/JavaScriptCore/kjs

Files:

• grammar.y (modified) (2 diffs)
• nodes.cpp (modified) (2 diffs)
• nodes.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/grammar.y

@@ -668 +668 @@
 
 FunctionDeclaration:
-    FUNCTION IDENT '(' ')' FunctionBody    { $$ = new FuncDeclNode(*$2, $5); }
+    FUNCTION '(' ')' FunctionBody  { YYABORT; }
+  | FUNCTION '(' FormalParameterList ')' FunctionBody
+                                   { YYABORT; }
+  | FUNCTION IDENT '(' ')' FunctionBody
+                                   { $$ = new FuncDeclNode(*$2, $5); }
   | FUNCTION IDENT '(' FormalParameterList ')' FunctionBody
                                    { $$ = new FuncDeclNode(*$2, $4, $6); }
+;
 
 FunctionExpr:
-    FUNCTION '(' ')' FunctionBody  { $$ = new FuncExprNode($4); }
+    FUNCTION '(' ')' FunctionBody  { $$ = new FuncExprNode(Identifier::null(), $4); }
   | FUNCTION '(' FormalParameterList ')' FunctionBody
-                                   { $$ = new FuncExprNode($3, $5); }
-
+                                   { $$ = new FuncExprNode(Identifier::null(), $3, $5); }
+  | FUNCTION IDENT '(' ')' FunctionBody
+                                   { $$ = new FuncExprNode(*$2, $5); }
+  | FUNCTION IDENT '(' FormalParameterList ')' FunctionBody
+                                   { $$ = new FuncExprNode(*$2, $4, $6); }
 ;
 
@@ -704 +712 @@
 
 SourceElement:
-    Statement                      { $$ = $1; }
-  | FunctionDeclaration            { $$ = $1; }
+    FunctionDeclaration            { $$ = $1; }
+  | Statement                      { $$ = $1; }
 ;
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2118 +2118 @@
 ValueImp *FuncExprNode::evaluate(ExecState *exec)
 {
-  FunctionImp *fimp = new DeclaredFunctionImp(exec, Identifier::null(), body.get(), exec->context().imp()->scopeChain());
+  ContextImp *context = exec->context().imp();
+  bool named = !ident.isNull();
+  ObjectImp *functionScopeObject = NULL;
+
+  if (named) {
+    // named FunctionExpressions can recursively call themselves,
+    // but they won't register with the current scope chain and should
+    // be contained as single property in an anonymous object.
+    functionScopeObject = new ObjectImp;
+    context->pushScope(functionScopeObject);
+  }
+
+  FunctionImp *fimp = new DeclaredFunctionImp(exec, ident, body.get(), context->scopeChain());
   ValueImp *ret(fimp);
   ValueImp *proto = exec->lexicalInterpreter()->builtinObject()->construct(exec, List::empty());
@@ -2126 +2138 @@
   for(ParameterNode *p = param.get(); p != 0L; p = p->nextParam(), plen++)
     fimp->addParameter(p->ident());
+
+  if (named) {
+    functionScopeObject->put(exec, ident, ret, Internal | ReadOnly | (context->codeType() == EvalCode ? 0 : DontDelete));
+    context->popScope();
+  }
 
   return ret;

trunk/JavaScriptCore/kjs/nodes.h

@@ -971 +971 @@
   class FuncExprNode : public Node {
   public:
-    FuncExprNode(FunctionBodyNode *b) : param(0), body(b) { }
-    FuncExprNode(ParameterNode *p, FunctionBodyNode *b)
-      : param(p->next), body(b) { p->next = 0; }
-    ValueImp *evaluate(ExecState *exec);
-    virtual void streamTo(SourceStream &s) const;
-  private:
+    FuncExprNode(const Identifier &i, FunctionBodyNode *b)
+      : ident(i), param(0), body(b) { }
+    FuncExprNode(const Identifier &i, ParameterNode *p, FunctionBodyNode *b)
+      : ident(i), param(p->next), body(b) { p->next = 0; }
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  private:
+    Identifier ident;
     KXMLCore::SharedPtr<ParameterNode> param;
     KXMLCore::SharedPtr<FunctionBodyNode> body;