Changeset 440 for trunk/JavaScriptCore/API/JSBase.cpp
- Timestamp:
- 08/18/08 11:14:49 (5 months ago)
- Files:
-
- trunk/JavaScriptCore/API/JSBase.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/JavaScriptCore/API/JSBase.cpp
r433 r440 30 30 #include "APICast.h" 31 31 #include "completion.h" 32 #include "OpaqueJSString.h" 32 33 #include <kjs/ExecState.h> 33 34 #include <kjs/InitializeThreading.h> … … 44 45 45 46 JSObject* jsThisObject = toJS(thisObject); 46 UString::Rep* scriptRep = toJS(script);47 UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;48 47 49 48 // Interpreter::evaluate sets "this" to the global object if it is NULL 50 49 JSGlobalObject* globalObject = exec->dynamicGlobalObject(); 51 Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);50 Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), sourceURL->ustring(), startingLineNumber, script->ustring(), jsThisObject); 52 51 53 52 if (completion.complType() == Throw) { … … 69 68 exec->globalData().heap->registerThread(); 70 69 71 UString::Rep* scriptRep = toJS(script); 72 UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null; 73 Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), UString(sourceURLRep), startingLineNumber, UString(scriptRep)); 70 Completion completion = Interpreter::checkSyntax(exec->dynamicGlobalObject()->globalExec(), sourceURL->ustring(), startingLineNumber, script->ustring()); 74 71 if (completion.complType() == Throw) { 75 72 if (exception)
