abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

SpiderMonkey 38 removes JS_Evaluate{,UC}Script, use JS::Evaluate.

Browse Source 
https://bugzilla.mozilla.org/show_bug.cgi?id=1100579

This was SVN commit r17508.
This commit is contained in:
leper 2015-12-19 01:58:03 +00:00
parent 56bf37a54e
commit 753936e7df
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/scriptinterface/ScriptInterface.cpp
View File

@ -116,7 +116,8 @@ void ErrorReporter(JSContext* cx, const char* message, JSErrorReport* report)
JS::RootedValue rval(cx);
const char dumpStack[] = "this.stack.trimRight().replace(/^/mg, ' ')"; // indent each line
if (JS_EvaluateScript(cx, excnObj, dumpStack, ARRAY_SIZE(dumpStack)-1, "(eval)", 1, &rval))
JS::CompileOptions opts(cx);
if (JS::Evaluate(cx, excnObj, opts.setFileAndLine("(eval)", 1), dumpStack, ARRAY_SIZE(dumpStack)-1, &rval))
{
std::string stackTrace;
if (ScriptInterface::FromJSVal(cx, rval, stackTrace))
@ -849,7 +850,7 @@ bool ScriptInterface::LoadScript(const VfsPath& filename, const std::string& cod
JS::RootedFunction func(m->m_cx,
JS_CompileUCFunction(m->m_cx, global, NULL, 0, NULL,
reinterpret_cast<const char16_t*> (codeUtf16.c_str()), (uint)(codeUtf16.length()), options)
reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)(codeUtf16.length()), options)
);
if (!func)
return false;
@ -871,9 +872,10 @@ bool ScriptInterface::LoadGlobalScript(const VfsPath& filename, const std::wstri
uint lineNo = 1;
JS::RootedValue rval(m->m_cx);
return JS_EvaluateUCScript(m->m_cx, global,
reinterpret_cast<const char16_t*> (codeUtf16.c_str()), (uint)(codeUtf16.length()),
utf8_from_wstring(filename.string()).c_str(), lineNo, &rval);
JS::CompileOptions opts(m->m_cx);
opts.setFileAndLine(filename.string8().c_str(), lineNo);
return JS::Evaluate(m->m_cx, global, opts,
reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)(codeUtf16.length()), &rval);
}
bool ScriptInterface::LoadGlobalScriptFile(const VfsPath& path)
@ -902,9 +904,10 @@ bool ScriptInterface::LoadGlobalScriptFile(const VfsPath& path)
uint lineNo = 1;
JS::RootedValue rval(m->m_cx);
return JS_EvaluateUCScript(m->m_cx, global,
reinterpret_cast<const char16_t*> (codeUtf16.c_str()), (uint)(codeUtf16.length()),
utf8_from_wstring(path.string()).c_str(), lineNo, &rval);
JS::CompileOptions opts(m->m_cx);
opts.setFileAndLine(path.string8().c_str(), lineNo);
return JS::Evaluate(m->m_cx, global, opts,
reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)(codeUtf16.length()), &rval);
}
bool ScriptInterface::Eval(const char* code)
@ -920,7 +923,9 @@ bool ScriptInterface::Eval_(const char* code, JS::MutableHandleValue rval)
JS::RootedObject global(m->m_cx, m->m_glob);
utf16string codeUtf16(code, code+strlen(code));
return JS_EvaluateUCScript(m->m_cx, global, (const char16_t*)codeUtf16.c_str(), (uint)codeUtf16.length(), "(eval)", 1, rval);
JS::CompileOptions opts(m->m_cx);
opts.setFileAndLine("(eval)", 1);
return JS::Evaluate(m->m_cx, global, opts, reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)codeUtf16.length(), rval);
}
bool ScriptInterface::Eval_(const wchar_t* code, JS::MutableHandleValue rval)
@ -929,7 +934,9 @@ bool ScriptInterface::Eval_(const wchar_t* code, JS::MutableHandleValue rval)
JS::RootedObject global(m->m_cx, m->m_glob);
utf16string codeUtf16(code, code+wcslen(code));
return JS_EvaluateUCScript(m->m_cx, global, (const char16_t*)codeUtf16.c_str(), (uint)codeUtf16.length(), "(eval)", 1, rval);
JS::CompileOptions opts(m->m_cx);
opts.setFileAndLine("(eval)", 1);
return JS::Evaluate(m->m_cx, global, opts, reinterpret_cast<const char16_t*>(codeUtf16.c_str()), (uint)codeUtf16.length(), rval);
}
bool ScriptInterface::ParseJSON(const std::string& string_utf8, JS::MutableHandleValue out)