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

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

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

trunk/JavaScriptCore/kjs/Parser.cpp

@@ -25 +25 @@
 #include "config.h"
 #include "Parser.h"
+#include "debugger.h"
 
 #include "lexer.h"
@@ -43 +44 @@
 }
 
-void Parser::parse(int startingLineNumber,
-    const UChar* code, unsigned length,
-    int* sourceId, int* errLine, UString* errMsg)
+void Parser::parse(ExecState* exec, const UString& sourceURL, int startingLineNumber,
+                   PassRefPtr<SourceProvider> prpSource,
+                   int* sourceId, int* errLine, UString* errMsg)
 {
     ASSERT(!m_sourceElements);
+    
+    int defaultSourceId;
+    int defaultErrLine;
+    UString defaultErrMsg;
+    
+    RefPtr<SourceProvider> source = prpSource;
 
-    if (errLine)
-        *errLine = -1;
-    if (errMsg)
-        *errMsg = 0;
+    if (!sourceId)
+        sourceId = &defaultSourceId;
+    if (!errLine)
+        errLine = &defaultErrLine;
+    if (!errMsg)
+        errMsg = &defaultErrMsg;
+
+    *errLine = -1;
+    *errMsg = 0;
         
     Lexer& lexer = KJS::lexer();
 
-    lexer.setCode(startingLineNumber, code, length);
-    m_sourceId++;
-    if (sourceId)
-        *sourceId = m_sourceId;
+    lexer.setCode(startingLineNumber, source);
+    *sourceId = ++m_sourceId;
 
     int parseError = kjsyyparse(&lexer);
@@ -68 +78 @@
 
     if (parseError || lexError) {
-        if (errLine)
-            *errLine = lexer.lineNo();
-        if (errMsg)
-            *errMsg = "Parse error";
+        *errLine = lexer.lineNo();
+        *errMsg = "Parse error";
         m_sourceElements.clear();
     }
+    
+    if (Debugger* debugger = exec->dynamicGlobalObject()->debugger())
+        debugger->sourceParsed(exec, *sourceId, sourceURL, *source, startingLineNumber, *errLine, *errMsg);
 }
 
@@ -79 +90 @@
                               ParserRefCountedData<DeclarationStacks::FunctionStack>* funcStack, bool usesEval, bool needsClosure, int lastLine)
 {
-    m_sourceElements = sourceElements ? sourceElements : new SourceElements;
+    m_sourceElements = sourceElements;
     m_varDeclarations = varStack;
     m_funcDeclarations = funcStack;