Changeset 3215 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

Dec 30, 2002, 3:17:23 PM (22 years ago)

Author:

darin

Message:

Reviewed by Don and Maciej.

• follow-on to my fix for 3134693 that fixes one more case of recursion and simplifies further

• kjs/grammar.y: Remove SourceElementNode and just use a StatementNode instead. Reverse SourceElements rule so the recursive rule comes first as in the original KJS code (avoids actual parser recursion).

• kjs/grammar.cpp: Regenerated.
• kjs/grammar.cpp.h: Regenerated.
• kjs/grammar.h: Regenerated.

• kjs/nodes.h: Make processFuncDecl a virtual function in StatementNode so that we can use a StatementNode instead of a SourceElementNode. Add a call to reverseList in BlockNode to correct the order of the linked list in SourceElementsNode, to replace the technique where we reversed it in the parser. Remove SourceElementNode class, and make the element in SourceElementsNode be a StatementNode instead.
• kjs/nodes.cpp: Remove SourceElementNode code. (StatementNode::processFuncDecl): Added empty function. (BlockNode::reverseList): Added. Used to make the SourceElements list ordered correctly.
• kjs/nodes2string.cpp: Remove SourceElementNode code.

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -124 +124 @@
     virtual Completion execute(ExecState *exec) = 0;
     void pushLabel(const Identifier &id) { ls.push(id); }
+    virtual void processFuncDecl(ExecState *exec);
   protected:
     LabelStack ls;
@@ -656 +657 @@
   class BlockNode : public StatementNode {
   public:
-    BlockNode(SourceElementsNode *s) : source(s) {}
+    BlockNode(SourceElementsNode *s) : source(s) { reverseList(); }
     virtual void ref();
     virtual bool deref();
@@ -663 +664 @@
     virtual void streamTo(SourceStream &s) const;
   protected:
+    void reverseList();
     SourceElementsNode *source;
   };
@@ -974 +976 @@
   };
 
-  class SourceElementNode : public StatementNode {
-  public:
-    SourceElementNode(StatementNode *s) : statement(s), function(0L) { }
-    SourceElementNode(FuncDeclNode *f) : statement(0L), function(f) { }
+  // A linked list of source element nodes
+  class SourceElementsNode : public StatementNode {
+  public:
+    SourceElementsNode(StatementNode *s1) { element = s1; elements = 0L; }
+    SourceElementsNode(SourceElementsNode *s1, StatementNode *s2)
+      { elements = s1; element = s2; }
     virtual void ref();
     virtual bool deref();
@@ -985 +989 @@
     virtual void streamTo(SourceStream &s) const;
   private:
-    StatementNode *statement;
-    FuncDeclNode *function;
-  };
-
-  // A linked list of source element nodes
-  class SourceElementsNode : public StatementNode {
-  public:
-    SourceElementsNode(SourceElementNode *s1) { element = s1; elements = 0L; }
-    SourceElementsNode(SourceElementsNode *s1, SourceElementNode *s2)
-      { elements = s1; element = s2; }
-    virtual void ref();
-    virtual bool deref();
-    Completion execute(ExecState *exec);
-    void processFuncDecl(ExecState *exec);
-    virtual void processVarDecls(ExecState *exec);
-    virtual void streamTo(SourceStream &s) const;
-  private:
-    SourceElementNode *element; // 'this' element
+    friend class BlockNode;
+    StatementNode *element; // 'this' element
     SourceElementsNode *elements; // pointer to next
   };