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

Timestamp:

Dec 18, 2007, 11:42:29 PM (17 years ago)

Author:

[email protected]

Message:

Replace post-parse pass to find declarations with logic in the parser itself

Reviewed by Geoff.

Instead of finding declarations in a pass following the initial parsing of
a program, we incorporate the logic directly into the parser. This lays
the groundwork for further optimisations (such as improving performance in
declaration expressions -- var x = y; -- to match that of standard assignment)
in addition to providing a 0.4% performance improvement in SunSpider.

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -112 +112 @@
   };
 
-  class Node : Noncopyable {
-  public:
-    Node() KJS_FAST_CALL;
-    Node(PlacementNewAdoptType) KJS_FAST_CALL { }
-    virtual ~Node();
-
-    UString toString() const KJS_FAST_CALL;
-    int lineNo() const KJS_FAST_CALL { return m_line; }
+  class ParserRefCounted : Noncopyable {
+  protected:
+    ParserRefCounted() KJS_FAST_CALL;
+    ParserRefCounted(PlacementNewAdoptType) KJS_FAST_CALL { }
+    
+  public:
     void ref() KJS_FAST_CALL;
     void deref() KJS_FAST_CALL;
     unsigned refcount() KJS_FAST_CALL;
-    static void clearNewNodes() KJS_FAST_CALL;
+    
+    static void deleteNewObjects() KJS_FAST_CALL;
+  
+    virtual ~ParserRefCounted();
+  };
+
+  class Node : public ParserRefCounted {
+  public:
+    Node() KJS_FAST_CALL;
+    Node(PlacementNewAdoptType placementAdopt) KJS_FAST_CALL
+    : ParserRefCounted(placementAdopt) { }
+
+    UString toString() const KJS_FAST_CALL;
+    int lineNo() const KJS_FAST_CALL { return m_line; }
 
     // Serialization.
@@ -1845 +1856 @@
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
+    VarDeclNode* getVarDecl() { return varDecl.get(); }
   private:
     Identifier ident;
@@ -1952 +1964 @@
   class ScopeNode : public BlockNode {
   public:
-    ScopeNode(SourceElements*) KJS_FAST_CALL;
+    ScopeNode(SourceElements*, DeclarationStacks::VarStack*, DeclarationStacks::FunctionStack*) KJS_FAST_CALL;
 
     int sourceId() KJS_FAST_CALL { return m_sourceId; }
@@ -1958 +1970 @@
 
   protected:
-    void initializeDeclarationStacks(ExecState*) KJS_FAST_CALL;
 
     DeclarationStacks::VarStack m_varStack;
@@ -1970 +1981 @@
   class ProgramNode : public ScopeNode {
   public:
-    ProgramNode(SourceElements*) KJS_FAST_CALL;
+    ProgramNode(SourceElements*, DeclarationStacks::VarStack*, DeclarationStacks::FunctionStack*) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     
@@ -1979 +1990 @@
   class EvalNode : public ScopeNode {
   public:
-    EvalNode(SourceElements*) KJS_FAST_CALL;
+    EvalNode(SourceElements*, DeclarationStacks::VarStack*, DeclarationStacks::FunctionStack*) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
     
@@ -1988 +1999 @@
   class FunctionBodyNode : public ScopeNode {
   public:
-    FunctionBodyNode(SourceElements*) KJS_FAST_CALL;
+    FunctionBodyNode(SourceElements*, DeclarationStacks::VarStack*, DeclarationStacks::FunctionStack*) KJS_FAST_CALL;
 
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
@@ -1998 +2009 @@
 
   private:
-    void initializeSymbolTable() KJS_FAST_CALL;
+    void initializeSymbolTable(ExecState*) KJS_FAST_CALL;
     void optimizeVariableAccess() KJS_FAST_CALL;
     ALWAYS_INLINE void processDeclarations(ExecState*) KJS_FAST_CALL;