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

Timestamp:

Oct 31, 2007, 3:54:37 AM (18 years ago)

Author:

oliver

Message:

Remove SourceCodeElement class and replaced with a Vector for a 0.8% gain on sunspider

Reviewed by Maciej

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -49 +49 @@
     class FuncDeclNode;
     class PropertyListNode;
-    class SourceElementsNode;
     class SourceStream;
     class VarDeclNode;
@@ -1507 +1506 @@
   class BlockNode : public StatementNode {
   public:
-    BlockNode(SourceElementsNode *s) KJS_FAST_CALL;
+    BlockNode(Vector<RefPtr<StatementNode> > *children) KJS_FAST_CALL;
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
@@ -1513 +1512 @@
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
   protected:
-    RefPtr<SourceElementsNode> source;
+    OwnPtr<Vector<RefPtr<StatementNode> > > m_children;
   };
 
@@ -1703 +1702 @@
   class FunctionBodyNode : public BlockNode {
   public:
-    FunctionBodyNode(SourceElementsNode *) KJS_FAST_CALL;
+    FunctionBodyNode(Vector<RefPtr<StatementNode> > *children) KJS_FAST_CALL;
     int sourceId() KJS_FAST_CALL { return m_sourceId; }
     const UString& sourceURL() KJS_FAST_CALL { return m_sourceURL; }
@@ -1774 +1773 @@
   };
 
-  // A linked list of source element nodes
-  class SourceElementsNode : public StatementNode {
-  public:
-    static int count;
-    SourceElementsNode(StatementNode*) KJS_FAST_CALL;
-    SourceElementsNode(SourceElementsNode*, StatementNode*) KJS_FAST_CALL;
-    
-    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    Completion execute(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    PassRefPtr<SourceElementsNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
-  private:
-    friend class BlockNode;
-    friend class CaseClauseNode;
-    RefPtr<StatementNode> node;
-    ListRefPtr<SourceElementsNode> next;
-  };
-
   class CaseClauseNode : public Node {
   public:
       CaseClauseNode(Node *e) KJS_FAST_CALL : expr(e) { m_mayHaveDeclarations = true; }
-      CaseClauseNode(Node *e, SourceElementsNode *s) KJS_FAST_CALL
-      : expr(e), source(s) { m_mayHaveDeclarations = true; }
+      CaseClauseNode(Node *e, Vector<RefPtr<StatementNode> > *children) KJS_FAST_CALL
+      : expr(e), m_children(children) { m_mayHaveDeclarations = true; }
       virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
       JSValue* evaluate(ExecState*) KJS_FAST_CALL;
@@ -1806 +1786 @@
   private:
       RefPtr<Node> expr;
-      RefPtr<SourceElementsNode> source;
+      OwnPtr<Vector<RefPtr<StatementNode> > > m_children;
   };
   
@@ -1857 +1837 @@
   class ProgramNode : public FunctionBodyNode {
   public:
-    ProgramNode(SourceElementsNode* s) KJS_FAST_CALL;
+    ProgramNode(Vector<RefPtr<StatementNode> > *children) KJS_FAST_CALL;
   };
 
@@ -1885 +1865 @@
   };
 
-  struct SourceElementList {
-      SourceElementsNode* head;
-      SourceElementsNode* tail;
-  };
-
   struct ClauseList {
       ClauseListNode* head;