Changeset 28540 in webkit for trunk/JavaScriptCore/kjs/Parser.cpp

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:

File:

• trunk/JavaScriptCore/kjs/Parser.cpp (modified) (4 diffs)

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;
 }