Changeset 15163 in webkit for trunk/JavaScriptCore/kjs/interpreter.cpp

Timestamp:

Jul 5, 2006, 9:52:54 AM (19 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Maciej.

• Return syntax error in JSCheckSyntax through a JSValueRef* exception argument

• API/JSBase.h:
• API/JSContextRef.cpp: (JSCheckSyntax):
• API/testapi.c: (main):
• JavaScriptCore.exp:
• kjs/interpreter.cpp: (KJS::Interpreter::checkSyntax):
• kjs/interpreter.h:

JavaScriptGlue:

Reviewed by Maciej.

• JSRun.cpp: (JSRun::CheckSyntax): Updated to use new checkSyntax syntax in JSC.
• JavaScriptGlue.xcodeproj/project.pbxproj:

File:

• trunk/JavaScriptCore/kjs/interpreter.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -413 +413 @@
 }
 
-bool Interpreter::checkSyntax(const UString &code)
+Completion Interpreter::checkSyntax(const UString& sourceURL, int startingLineNumber, const UString& code)
+{
+    return checkSyntax(sourceURL, startingLineNumber, code.data(), code.size());
+}
+
+Completion Interpreter::checkSyntax(const UString& sourceURL, int startingLineNumber, const UChar* code, int codeLength)
 {
     JSLock lock;
-    
-    // Parser::parse() returns 0 in a syntax error occurs
-    RefPtr<ProgramNode> progNode = Parser::parse(UString(), 0, code.data(), code.size(), 0, 0, 0);
-    return progNode;
+
+    int errLine;
+    UString errMsg;
+    RefPtr<ProgramNode> progNode = Parser::parse(sourceURL, startingLineNumber, code, codeLength, 0, &errLine, &errMsg);
+    if (!progNode)
+        return Completion(Throw, Error::create(&m_globalExec, SyntaxError, errMsg, errLine, 0, &sourceURL));
+    return Completion(Normal);
 }