wraitii
fd8f5abd2e
No particularly noteworthy changes, as most complex API changes were already supported in SM45 and done. The addition of JSStructuredCloneData allows to remove our custom class. Changes: - InformalValueTypeName is back in the API, so remove our implementation. - Stop using JSRuntime entirely in favour of JSContext* - JSPropertyDescriptor is renamed. - CompartmentOptions are tweaked slightly (no functional changes) - JS::Construct - API update. - JSClass split - API update. - A js.msg error message was removed, so we had to use a different one. - Tests fix: fix comparison of union instances - Disable warning in spidermonkey Vector.h - Update error reporting to SM52 (minor API updates) - Ignore warnings about unused return values (would come from OOM, which isn't recoverable) Most of the patching was done by Itms. Tested by: Stan, Freagarach Fixes #4893 Differential Revision: https://code.wildfiregames.com/D3095 This was SVN commit r24203.
106 lines
2.8 KiB
C++
106 lines
2.8 KiB
C++
/* Copyright (C) 2020 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "ScriptExceptions.h"
|
|
|
|
#include "ps/CLogger.h"
|
|
#include "scriptinterface/ScriptInterface.h"
|
|
|
|
bool ScriptException::IsPending(const ScriptRequest& rq)
|
|
{
|
|
return JS_IsExceptionPending(rq.cx);
|
|
}
|
|
|
|
bool ScriptException::CatchPending(const ScriptRequest& rq)
|
|
{
|
|
if (!JS_IsExceptionPending(rq.cx))
|
|
return false;
|
|
|
|
JS::RootedValue excn(rq.cx);
|
|
ENSURE(JS_GetPendingException(rq.cx, &excn));
|
|
|
|
if (excn.isUndefined())
|
|
{
|
|
LOGERROR("JavaScript error: (undefined)");
|
|
JS_ClearPendingException(rq.cx);
|
|
return true;
|
|
}
|
|
|
|
// As of SM45/52, there is no way to recover a stack in case the thrown thing is not an Error object.
|
|
if (!excn.isObject())
|
|
{
|
|
CStr error;
|
|
ScriptInterface::FromJSVal(rq, excn, error);
|
|
LOGERROR("JavaScript error: %s", error);
|
|
JS_ClearPendingException(rq.cx);
|
|
return true;
|
|
}
|
|
|
|
JS::RootedObject excnObj(rq.cx, &excn.toObject());
|
|
JSErrorReport* report = JS_ErrorFromException(rq.cx, excnObj);
|
|
|
|
if (!report)
|
|
{
|
|
CStr error;
|
|
ScriptInterface::FromJSVal(rq, excn, error);
|
|
LOGERROR("JavaScript error: %s", error);
|
|
JS_ClearPendingException(rq.cx);
|
|
return true;
|
|
}
|
|
|
|
std::stringstream msg;
|
|
msg << (JSREPORT_IS_EXCEPTION(report->flags) ? "JavaScript exception: " : "JavaScript error: ");
|
|
if (report->filename)
|
|
{
|
|
msg << report->filename;
|
|
msg << " line " << report->lineno << "\n";
|
|
}
|
|
|
|
msg << report->message().c_str();
|
|
|
|
JS::RootedObject stackObj(rq.cx, ExceptionStackOrNull(excnObj));
|
|
JS::RootedValue stackVal(rq.cx, JS::ObjectOrNullValue(stackObj));
|
|
if (!stackVal.isNull())
|
|
{
|
|
std::string stackText;
|
|
ScriptInterface::FromJSVal(rq, stackVal, stackText);
|
|
|
|
std::istringstream stream(stackText);
|
|
for (std::string line; std::getline(stream, line);)
|
|
msg << "\n " << line;
|
|
}
|
|
|
|
LOGERROR("%s", msg.str().c_str());
|
|
|
|
// When running under Valgrind, print more information in the error message
|
|
// VALGRIND_PRINTF_BACKTRACE("->");
|
|
|
|
JS_ClearPendingException(rq.cx);
|
|
return true;
|
|
}
|
|
|
|
void ScriptException::Raise(const ScriptRequest& rq, const char* format, ...)
|
|
{
|
|
va_list ap;
|
|
va_start(ap, format);
|
|
JS_ReportErrorUTF8(rq.cx, format, ap);
|
|
va_end(ap);
|
|
}
|