Changeset 28540 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 7, 2007, 4:01:13 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam Weinig.

Refactored parsing of global code: Removed the assumption that
ProgramNode inherits from FunctionBodyNode from the parser.

• kjs/Parser.cpp: (KJS::Parser::parseProgram): (KJS::Parser::parseFunctionBody): (KJS::Parser::parse):
• kjs/Parser.h: (KJS::Parser::didFinishParsing):
• kjs/function.cpp:
• kjs/grammar.y:
• kjs/nodes.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/Parser.cpp (modified) (4 diffs)
• kjs/Parser.h (modified) (3 diffs)
• kjs/function.cpp (modified) (1 diff)
• kjs/grammar.y (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/nodes.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-12-07  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Sam Weinig.
+        
+        Refactored parsing of global code: Removed the assumption that 
+        ProgramNode inherits from FunctionBodyNode from the parser.
+
+        * kjs/Parser.cpp:
+        (KJS::Parser::parseProgram):
+        (KJS::Parser::parseFunctionBody):
+        (KJS::Parser::parse):
+        * kjs/Parser.h:
+        (KJS::Parser::didFinishParsing):
+        * kjs/function.cpp:
+        * kjs/grammar.y:
+        * kjs/nodes.h:
+
 2007-12-07  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -45 +45 @@
 {
     parse(sourceURL, startingLineNumber, code, length, sourceId, errLine, errMsg);
-    return m_progNode.release();
+    if (!m_sourceElements)
+        return 0;
+    return new ProgramNode(m_sourceElements.release());
 }
 
@@ -53 +55 @@
 {
     parse(sourceURL, startingLineNumber, code, length, sourceId, errLine, errMsg);
-    return m_progNode.release();
+    if (!m_sourceElements)
+        return 0;
+    return new FunctionBodyNode(m_sourceElements.release());
 }
 
@@ -60 +64 @@
     int* sourceId, int* errLine, UString* errMsg)
 {
-    ASSERT(!m_progNode);
+    ASSERT(!m_sourceElements);
 
     if (errLine)
@@ -85 +89 @@
         if (errMsg)
             *errMsg = "Parse error";
-        m_progNode = 0;
+        m_sourceElements.clear();
     }
-}
-
-void Parser::didFinishParsing(PassRefPtr<ProgramNode> progNode)
-{
-    m_progNode = progNode;
 }
 

trunk/JavaScriptCore/kjs/Parser.h

@@ -29 +29 @@
 #include <wtf/Noncopyable.h>
 #include <wtf/RefPtr.h>
+#include "nodes.h"
 
 namespace KJS {
@@ -49 +50 @@
 
         int sourceId() { return m_sourceId; }
-        
-        void didFinishParsing(PassRefPtr<ProgramNode>);
+
+        void didFinishParsing(SourceElements* sourceElements)
+        {
+            m_sourceElements.set(sourceElements);
+        }
 
     private:
@@ -61 +65 @@
 
         int m_sourceId;
-        RefPtr<ProgramNode> m_progNode;
+        OwnPtr<SourceElements> m_sourceElements;
     };
     

trunk/JavaScriptCore/kjs/function.cpp

@@ -29 +29 @@
 #include "ExecState.h"
 #include "JSGlobalObject.h"
-#include "JSVariableObject.h"
+#include "Parser.h"
 #include "PropertyNameArray.h"
 #include "debugger.h"

trunk/JavaScriptCore/kjs/grammar.y

@@ -879 +879 @@
 
 Program:
-    /* not in spec */                   { parser().didFinishParsing(new ProgramNode(new SourceElements)); }
-    | SourceElements                    { parser().didFinishParsing(new ProgramNode($1->release())); }
+    /* not in spec */                   { parser().didFinishParsing(new SourceElements); }
+    | SourceElements                    { parser().didFinishParsing($1->release()); }
 ;
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -3664 +3664 @@
 
 BlockNode::BlockNode(SourceElements* children)
-{
-    ASSERT(children);
+    : m_children(children)
+{
+    ASSERT(m_children);
     m_mayHaveDeclarations = true; 
-    m_children.set(children);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -27 +27 @@
 #define NODES_H_
 
-#include "Parser.h"
 #include "internal.h"
 #include "regexp.h"