Changeset 5209 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 18, 2003, 2:13:32 PM (22 years ago)

Author:

darin

Message:

Reviewed by Dave.

• fixed 3367015 -- interdependent variable declarations in for loop don't work (they go backwards)

• kjs/nodes.h: (KJS::ForNode::ForNode): Add a new overload of the constructor for when the first parameter is a variable declaration list. Call reverseList as we do in other constructors that take lists that are built backwards.
• kjs/nodes.cpp: (ForNode::reverseList): Added. New helper function.

Location:

trunk/JavaScriptCore/kjs

Files:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1988 +1988 @@
 // ------------------------------ ForNode --------------------------------------
 
+VarDeclListNode *ForNode::reverseList(VarDeclListNode *list)
+{
+  VarDeclListNode *head = 0;
+  VarDeclListNode *next;
+  for (VarDeclListNode *n = list; n; n = next) {
+    next = n->list;
+    n->list = head;
+    head = n;
+  }
+  return head;
+}
+
 void ForNode::ref()
 {

trunk/JavaScriptCore/kjs/nodes.h

@@ -640 +640 @@
     virtual void streamTo(SourceStream &s) const;
   private:
+    friend class ForNode;
     friend class VarStatementNode;
     VarDeclListNode *list;
@@ -733 +734 @@
     ForNode(Node *e1, Node *e2, Node *e3, StatementNode *s) :
       expr1(e1), expr2(e2), expr3(e3), statement(s) {}
-    virtual void ref();
-    virtual bool deref();
-    virtual Completion execute(ExecState *exec);
-    virtual void processVarDecls(ExecState *exec);
-    virtual void streamTo(SourceStream &s) const;
-  private:
+    ForNode(VarDeclListNode *e1, Node *e2, Node *e3, StatementNode *s) :
+      expr1(reverseList(e1)), expr2(e2), expr3(e3), statement(s) {}
+    virtual void ref();
+    virtual bool deref();
+    virtual Completion execute(ExecState *exec);
+    virtual void processVarDecls(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  private:
+    static VarDeclListNode *reverseList(VarDeclListNode *);
     Node *expr1, *expr2, *expr3;
     StatementNode *statement;