JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / API / JSScriptRef.cpp

diff --git a/API/JSScriptRef.cpp b/API/JSScriptRef.cpp
index 1e872c7c0b56c347db0bc838be333a51dea2a161..a7baf144a2c5b958b033afa87f4afe96c63def13 100644 (file)
--- a/API/JSScriptRef.cpp
+++ b/API/JSScriptRef.cpp
@@ -27,6 +27,7 @@
 
 #include "APICast.h"
 #include "Completion.h"
 
 #include "APICast.h"
 #include "Completion.h"

+#include "Exception.h"

 #include "JSBasePrivate.h"
 #include "VM.h"
 #include "JSScriptRefPrivate.h"
 #include "JSBasePrivate.h"
 #include "VM.h"
 #include "JSScriptRefPrivate.h"


@@ -40,9 +41,9 @@ using namespace JSC;
 
 struct OpaqueJSScript : public SourceProvider {
 public:
 
 struct OpaqueJSScript : public SourceProvider {
 public:

-    static WTF::PassRefPtr<OpaqueJSScript> create(VM* vm, const String& url, int startingLineNumber, const String& source)
+    static WTF::RefPtr<OpaqueJSScript> create(VM* vm, const String& url, int startingLineNumber, const String& source)

     {
     {

-        return WTF::adoptRef(new OpaqueJSScript(vm, url, startingLineNumber, source));
+        return WTF::adoptRef(*new OpaqueJSScript(vm, url, startingLineNumber, source));

     }
 
     virtual const String& source() const override
     }
 
     virtual const String& source() const override


@@ -68,7 +69,10 @@ private:
 
 static bool parseScript(VM* vm, const SourceCode& source, ParserError& error)
 {
 
 static bool parseScript(VM* vm, const SourceCode& source, ParserError& error)
 {

-    return JSC::parse<JSC::ProgramNode>(vm, source, 0, Identifier(), JSParseNormal, JSParseProgramCode, error);
+    return !!JSC::parse<JSC::ProgramNode>(
+        vm, source, 0, Identifier(), JSParserBuiltinMode::NotBuiltin, 
+        JSParserStrictMode::NotStrict, JSParserCodeType::Program, 
+        error);

 }
 
 extern "C" {
 }
 
 extern "C" {


@@ -84,15 +88,15 @@ JSScriptRef JSScriptCreateReferencingImmortalASCIIText(JSContextGroupRef context
 
     startingLineNumber = std::max(1, startingLineNumber);
 
 
     startingLineNumber = std::max(1, startingLineNumber);
 

-    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));
+    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, String(StringImpl::createFromLiteral(source, length)));

 
     ParserError error;
     if (!parseScript(vm, SourceCode(result), error)) {
         if (errorMessage)
 
     ParserError error;
     if (!parseScript(vm, SourceCode(result), error)) {
         if (errorMessage)

-            *errorMessage = OpaqueJSString::create(error.m_message).leakRef();
+            *errorMessage = OpaqueJSString::create(error.message()).leakRef();

         if (errorLine)
         if (errorLine)

-            *errorLine = error.m_line;
-        return 0;
+            *errorLine = error.line();
+        return nullptr;

     }
 
     return result.release().leakRef();
     }
 
     return result.release().leakRef();


@@ -105,15 +109,15 @@ JSScriptRef JSScriptCreateFromString(JSContextGroupRef contextGroup, JSStringRef
 
     startingLineNumber = std::max(1, startingLineNumber);
 
 
     startingLineNumber = std::max(1, startingLineNumber);
 

-    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url->string(), startingLineNumber, source->string());
+    RefPtr<OpaqueJSScript> result = OpaqueJSScript::create(vm, url ? url->string() : String(), startingLineNumber, source->string());

 
     ParserError error;
     if (!parseScript(vm, SourceCode(result), error)) {
         if (errorMessage)
 
     ParserError error;
     if (!parseScript(vm, SourceCode(result), error)) {
         if (errorMessage)

-            *errorMessage = OpaqueJSString::create(error.m_message).leakRef();
+            *errorMessage = OpaqueJSString::create(error.message()).leakRef();

         if (errorLine)
         if (errorLine)

-            *errorLine = error.m_line;
-        return 0;
+            *errorLine = error.line();
+        return nullptr;

     }
 
     return result.release().leakRef();
     }
 
     return result.release().leakRef();


@@ -139,12 +143,12 @@ JSValueRef JSScriptEvaluate(JSContextRef context, JSScriptRef script, JSValueRef
         RELEASE_ASSERT_NOT_REACHED();
         return 0;
     }
         RELEASE_ASSERT_NOT_REACHED();
         return 0;
     }

-    JSValue internalException;
+    NakedPtr<Exception> internalException;

     JSValue thisValue = thisValueRef ? toJS(exec, thisValueRef) : jsUndefined();
     JSValue thisValue = thisValueRef ? toJS(exec, thisValueRef) : jsUndefined();

-    JSValue result = evaluate(exec, SourceCode(script), thisValue, &internalException);
+    JSValue result = evaluate(exec, SourceCode(script), thisValue, internalException);

     if (internalException) {
         if (exception)
     if (internalException) {
         if (exception)

-            *exception = toRef(exec, internalException);
+            *exception = toRef(exec, internalException->value());

         return 0;
     }
     ASSERT(result);
         return 0;
     }
     ASSERT(result);