Changeset 14502 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

May 20, 2006, 1:19:22 PM (19 years ago)

Author:

andersca

Message:

JavaScriptCore:

2006-05-20 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=8993
Support function declaration in case statements

• kjs/grammar.y: Get rid of StatementList and use SourceElements instead.

• kjs/nodes.cpp: (CaseClauseNode::evalStatements): (CaseClauseNode::processVarDecls): (CaseClauseNode::processFuncDecl): (ClauseListNode::processFuncDecl): (CaseBlockNode::processFuncDecl): (SwitchNode::processFuncDecl):
• kjs/nodes.h: (KJS::CaseClauseNode::CaseClauseNode): (KJS::ClauseListNode::ClauseListNode): (KJS::ClauseListNode::getClause): (KJS::ClauseListNode::getNext): (KJS::ClauseListNode::releaseNext): (KJS::SwitchNode::SwitchNode): Add processFuncDecl for the relevant nodes.

• kjs/nodes2string.cpp: (CaseClauseNode::streamTo): next got renamed to source.

LayoutTests:

2006-05-20 Anders Carlsson <​[email protected]>

Reviewed by Geoff.

• fast/js/function-declarations-in-switch-statement-expected.txt: Added.
• fast/js/function-declarations-in-switch-statement.html: Added.
• fast/js/resources/function-declarations-in-switch-statement.js: Added.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1509 +1509 @@
 }
 
-// ------------------------------ StatListNode ---------------------------------
-
-StatListNode::StatListNode(StatementNode *s)
-  : statement(s), next(this)
-{
-    Parser::noteNodeCycle(this);
-    setLoc(s->firstLine(), s->lastLine());
-}
- 
-StatListNode::StatListNode(StatListNode *l, StatementNode *s)
-  : statement(s), next(l->next)
-{
-  l->next = this;
-  setLoc(l->firstLine(), s->lastLine());
-}
-
-// ECMA 12.1
-Completion StatListNode::execute(ExecState *exec)
-{
-  Completion c = statement->execute(exec);
-  KJS_ABORTPOINT
-  if (c.complType() != Normal)
-    return c;
-  
-  JSValue *v = c.value();
-  
-  for (StatListNode *n = next.get(); n; n = n->next.get()) {
-    Completion c2 = n->statement->execute(exec);
-    KJS_ABORTPOINT
-    if (c2.complType() != Normal)
-      return c2;
-
-    if (c2.isValueCompletion())
-      v = c2.value();
-    c = c2;
-  }
-
-  return Completion(c.complType(), v, c.target());
-}
-
-void StatListNode::processVarDecls(ExecState *exec)
-{
-  for (StatListNode *n = this; n; n = n->next.get())
-    n->statement->processVarDecls(exec);
-}
-
-void StatListNode::breakCycle() 
-{ 
-    next = 0;
-}
-
 // ------------------------------ AssignExprNode -------------------------------
 
@@ -2095 +2044 @@
 Completion CaseClauseNode::evalStatements(ExecState *exec)
 {
-  if (next)
-    return next->execute(exec);
+  if (source)
+    return source->execute(exec);
   else
     return Completion(Normal, jsUndefined());
@@ -2103 +2052 @@
 void CaseClauseNode::processVarDecls(ExecState *exec)
 {
-  if (next)
-    next->processVarDecls(exec);
+  if (source)
+    source->processVarDecls(exec);
+}
+
+void CaseClauseNode::processFuncDecl(ExecState* exec)
+{
+  if (source)
+      source->processFuncDecl(exec);
 }
 
@@ -2122 +2077 @@
     if (n->clause)
       n->clause->processVarDecls(exec);
+}
+
+void ClauseListNode::processFuncDecl(ExecState* exec)
+{
+  for (ClauseListNode* n = this; n; n = n->next.get())
+    if (n->clause)
+      n->clause->processFuncDecl(exec);
 }
 
@@ -2231 +2193 @@
 }
 
+void CaseBlockNode::processFuncDecl(ExecState* exec)
+{
+  if (list1)
+   list1->processFuncDecl(exec);
+  if (def)
+    def->processFuncDecl(exec);
+  if (list2)
+    list2->processFuncDecl(exec);
+}
+
 // ------------------------------ SwitchNode -----------------------------------
 
@@ -2253 +2225 @@
 {
   block->processVarDecls(exec);
+}
+
+void SwitchNode::processFuncDecl(ExecState* exec)
+{
+  block->processFuncDecl(exec);
 }