JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / parser / Parser.cpp

diff --git a/parser/Parser.cpp b/parser/Parser.cpp
index 886a513d2598c74a7f32fb2a2f3eb678d75272f7..fc1e986683ee6dce40932af61bbf93633b8e978b 100644 (file)
--- a/parser/Parser.cpp
+++ b/parser/Parser.cpp
@@ -24,22 +24,15 @@
 #include "Parser.h"
 
 #include "Debugger.h"
 #include "Parser.h"
 
 #include "Debugger.h"

+#include "JSParser.h"

 #include "Lexer.h"
 #include "Lexer.h"

-#include <wtf/HashSet.h>
-#include <wtf/Vector.h>
-#include <memory>
-
-using std::auto_ptr;
-
-#ifndef yyparse
-extern int jscyyparse(void*);
-#endif

 
 namespace JSC {
 
 
 namespace JSC {
 

-void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg)
+void Parser::parse(JSGlobalData* globalData, FunctionParameters* parameters, JSParserStrictness strictness, JSParserMode mode, int* errLine, UString* errMsg)

 {
 {

-    ASSERT(!m_sourceElements);
+    ASSERT(globalData);
+    m_sourceElements = 0;

 
     int defaultErrLine;
     UString defaultErrMsg;
 
     int defaultErrLine;
     UString defaultErrMsg;


@@ -50,54 +43,30 @@ void Parser::parse(JSGlobalData* globalData, int* errLine, UString* errMsg)
         errMsg = &defaultErrMsg;
 
     *errLine = -1;
         errMsg = &defaultErrMsg;
 
     *errLine = -1;

-    *errMsg = 0;
+    *errMsg = UString();

 
     Lexer& lexer = *globalData->lexer;
 
     Lexer& lexer = *globalData->lexer;

-    lexer.setCode(*m_source);
+    lexer.setCode(*m_source, m_arena);

 
 

-    int parseError = jscyyparse(globalData);
+    const char* parseError = jsParse(globalData, parameters, strictness, mode, m_source);
+    int lineNumber = lexer.lineNumber();

     bool lexError = lexer.sawError();
     lexer.clear();
 
     bool lexError = lexer.sawError();
     lexer.clear();
 

-    ParserRefCounted::deleteNewObjects(globalData);
-

     if (parseError || lexError) {
     if (parseError || lexError) {

-        *errLine = lexer.lineNo();
-        *errMsg = "Parse error";
-        m_sourceElements.clear();
+        *errLine = lineNumber;
+        *errMsg = parseError ? parseError : "Parse error";
+        m_sourceElements = 0;

     }
 }
 
     }
 }
 

-void Parser::reparseInPlace(JSGlobalData* globalData, FunctionBodyNode* functionBodyNode)
-{
-    ASSERT(!functionBodyNode->data());
-
-    m_source = &functionBodyNode->source();
-    globalData->lexer->setIsReparsing();
-    parse(globalData, 0, 0);
-    ASSERT(m_sourceElements);
-
-    functionBodyNode->adoptData(std::auto_ptr<ScopeNodeData>(new ScopeNodeData(m_sourceElements.get(),
-                                                                               m_varDeclarations ? &m_varDeclarations->data : 0, 
-                                                                               m_funcDeclarations ? &m_funcDeclarations->data : 0,
-                                                                               m_numConstants)));
-    bool usesArguments = functionBodyNode->usesArguments();
-    functionBodyNode->setFeatures(m_features);
-    if (usesArguments && !functionBodyNode->usesArguments())
-        functionBodyNode->setUsesArguments();
-
-    m_source = 0;
-    m_sourceElements = 0;
-    m_varDeclarations = 0;
-    m_funcDeclarations = 0;
-}
-
-void Parser::didFinishParsing(SourceElements* sourceElements, ParserRefCountedData<DeclarationStacks::VarStack>* varStack, 
-                              ParserRefCountedData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants)
+void Parser::didFinishParsing(SourceElements* sourceElements, ParserArenaData<DeclarationStacks::VarStack>* varStack, 
+                              ParserArenaData<DeclarationStacks::FunctionStack>* funcStack, CodeFeatures features, int lastLine, int numConstants, IdentifierSet& capturedVars)

 {
     m_sourceElements = sourceElements;
     m_varDeclarations = varStack;
     m_funcDeclarations = funcStack;
 {
     m_sourceElements = sourceElements;
     m_varDeclarations = varStack;
     m_funcDeclarations = funcStack;

+    m_capturedVariables.swap(capturedVars);

     m_features = features;
     m_lastLine = lastLine;
     m_numConstants = numConstants;
     m_features = features;
     m_lastLine = lastLine;
     m_numConstants = numConstants;