Changeset 15163 in webkit for trunk/JavaScriptCore/API

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:

Location:

trunk/JavaScriptCore/API

Files:

• JSBase.h (modified) (2 diffs)
• JSContextRef.cpp (modified) (1 diff)
• testapi.c (modified) (1 diff)

trunk/JavaScriptCore/API/JSBase.h

@@ -53 +53 @@
   @param sourceURL          URL to the file containing the JavaScript, or NULL - this is only used for error reporting
   @param startingLineNumber the JavaScript's starting line number in the file located at sourceURL - this is only used for error reporting
-  @param exception          pointer to a JSValueRef in which to store an uncaught exception, or NULL
+  @param exception          pointer to a JSValueRef in which to store an uncaught exception, if any; can be NULL
   @result                   result of evaluation, or NULL if an uncaught exception was thrown
 */
@@ -60 +60 @@
 /*!
   @function JSCheckSyntax
-  Checks for syntax errors in a string of JavaScript code
-  @param context execution context to use
-  @param script a string containing the script source code
-  @result true if the script is syntactically correct, false otherwise
+  Check for syntax errors in a string of JavaScript
+  @param context            execution context to use
+  @param script             a character buffer containing the JavaScript to evaluate
+  @param sourceURL          URL to the file containing the JavaScript, or NULL - this is only used for error reporting
+  @param startingLineNumber the JavaScript's starting line number in the file located at sourceURL - this is only used for error reporting
+  @param exception          pointer to a JSValueRef in which to store a syntax error, if any; can be NULL
+  @result                   true if the script is syntactically correct, false otherwise
 
 */
-bool JSCheckSyntax(JSContextRef context, JSCharBufferRef script);
+bool JSCheckSyntax(JSContextRef context, JSCharBufferRef script, JSCharBufferRef sourceURL, int startingLineNumber, JSValueRef* exception);
 
 // Garbage collection

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -95 +95 @@
 }
 
-bool JSCheckSyntax(JSContextRef context, JSCharBufferRef script)
+bool JSCheckSyntax(JSContextRef context, JSCharBufferRef script, JSCharBufferRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     JSLock lock;
+
     ExecState* exec = toJS(context);
-    UString::Rep* rep = toJS(script);
-    return exec->dynamicInterpreter()->checkSyntax(UString(rep));
+    UString::Rep* scriptRep = toJS(script);
+    UString::Rep* sourceURLRep = toJS(sourceURL);
+    Completion completion = exec->dynamicInterpreter()->checkSyntax(UString(sourceURLRep), startingLineNumber, UString(scriptRep));
+    if (completion.complType() == Throw) {
+        if (exception)
+            *exception = toRef(completion.value());
+        return false;
+    }
+    
+    return true;
 }
 

trunk/JavaScriptCore/API/testapi.c

@@ -495 +495 @@
     JSCharBufferRef goodSyntaxBuf = JSCharBufferCreateUTF8("x = 1;");
     JSCharBufferRef badSyntaxBuf = JSCharBufferCreateUTF8("x := 1;");
-    assert(JSCheckSyntax(context, goodSyntaxBuf));
-    assert(!JSCheckSyntax(context, badSyntaxBuf));
+    assert(JSCheckSyntax(context, goodSyntaxBuf, NULL, 0, NULL));
+    assert(!JSCheckSyntax(context, badSyntaxBuf, NULL, 0, NULL));
 
     JSValueRef result;