Changeset 28854 in webkit for trunk/JavaScriptCore/kjs/Parser.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/Parser.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/Parser.h

@@ -29 +29 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/RefPtr.h>
 #include "nodes.h"
 
@@ -38 +39 @@
 
     struct UChar;
+
+    template <typename T> struct ParserRefCountedData : ParserRefCounted {
+        T data;
+    };
 
     class Parser : Noncopyable {
@@ -49 +54 @@
         int sourceId() const { return m_sourceId; }
 
-        void didFinishParsing(SourceElements* sourceElements, int lastLine)
+        void didFinishParsing(SourceElements* sourceElements, ParserRefCountedData<DeclarationStacks::VarStack>* varStack, 
+                              ParserRefCountedData<DeclarationStacks::FunctionStack>* funcStack, int lastLine)
         {
             m_sourceElements.set(sourceElements);
+            m_varDeclarations = varStack;
+            m_funcDeclarations = funcStack;
             m_lastLine = lastLine;
         }
@@ -65 +73 @@
         int m_sourceId;
         OwnPtr<SourceElements> m_sourceElements;
+        RefPtr<ParserRefCountedData<DeclarationStacks::VarStack> > m_varDeclarations;
+        RefPtr<ParserRefCountedData<DeclarationStacks::FunctionStack> > m_funcDeclarations;
         int m_lastLine;
     };
@@ -81 +91 @@
             return 0;
         }
-        RefPtr<ParsedNode> node = new ParsedNode(m_sourceElements.release());
+        RefPtr<ParsedNode> node = new ParsedNode(m_sourceElements.release(), 
+                                                 m_varDeclarations ? &m_varDeclarations->data : 0, 
+                                                 m_funcDeclarations ? &m_funcDeclarations->data : 0);
+        m_varDeclarations = 0;
+        m_funcDeclarations = 0;
         m_sourceURL = UString();
         node->setLoc(startingLineNumber, m_lastLine);