wraitii
d92a2118b0
This ugprades 0 A.D. to the latest ESR at the moment of writing. Mostly straighforward API changes (see meta-Bug 1633145) - js::Class is merged with JSClass - JSNewArrayObject becomes JS::NewArrayObject - ArrayObject-functions are moved to a new public header Array.h - JSMSG error messages have again been changed, requiring some tweaks. - AutoValueArray becomes RootedBalueArray (Bug 1634435) - 'uneval' is behind a Realm flag (Bug 1565170), but no removal is planned in the short-term future. - Some minor GC API changes (Bugs 1569564 and 1633405) - Error reporting has had some tweaks, and error flags have been removed (Bug 1620583) - StructuredClone are now always thread-safe, simplifying an API change introduced in SM52 (Bug 1607791) Tested by: Stan, Freagarach, mammadori Closes #5861 Differential Revision: https://code.wildfiregames.com/D3168 This was SVN commit r24333.
110 lines
3.1 KiB
C++
110 lines
3.1 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/>.
|
|
*/
|
|
|
|
#ifndef INCLUDED_SCRIPTCONVERSIONS
|
|
#define INCLUDED_SCRIPTCONVERSIONS
|
|
|
|
#include "ScriptInterface.h"
|
|
#include "scriptinterface/ScriptExtraHeaders.h" // for typed arrays
|
|
|
|
#include <limits>
|
|
|
|
template<typename T> static void ToJSVal_vector(const ScriptRequest& rq, JS::MutableHandleValue ret, const std::vector<T>& val)
|
|
{
|
|
JS::RootedObject obj(rq.cx, JS::NewArrayObject(rq.cx, 0));
|
|
if (!obj)
|
|
{
|
|
ret.setUndefined();
|
|
return;
|
|
}
|
|
|
|
ENSURE(val.size() <= std::numeric_limits<u32>::max());
|
|
for (u32 i = 0; i < val.size(); ++i)
|
|
{
|
|
JS::RootedValue el(rq.cx);
|
|
ScriptInterface::ToJSVal<T>(rq, &el, val[i]);
|
|
JS_SetElement(rq.cx, obj, i, el);
|
|
}
|
|
ret.setObject(*obj);
|
|
}
|
|
|
|
#define FAIL(msg) STMT(ScriptException::Raise(rq, msg); return false)
|
|
|
|
template<typename T> static bool FromJSVal_vector(const ScriptRequest& rq, JS::HandleValue v, std::vector<T>& out)
|
|
{
|
|
JS::RootedObject obj(rq.cx);
|
|
if (!v.isObject())
|
|
FAIL("Argument must be an array");
|
|
|
|
bool isArray;
|
|
obj = &v.toObject();
|
|
if ((!JS::IsArrayObject(rq.cx, obj, &isArray) || !isArray) && !JS_IsTypedArrayObject(obj))
|
|
FAIL("Argument must be an array");
|
|
|
|
u32 length;
|
|
if (!JS::GetArrayLength(rq.cx, obj, &length))
|
|
FAIL("Failed to get array length");
|
|
|
|
out.reserve(length);
|
|
for (u32 i = 0; i < length; ++i)
|
|
{
|
|
JS::RootedValue el(rq.cx);
|
|
if (!JS_GetElement(rq.cx, obj, i, &el))
|
|
FAIL("Failed to read array element");
|
|
T el2;
|
|
if (!ScriptInterface::FromJSVal<T>(rq, el, el2))
|
|
return false;
|
|
out.push_back(el2);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#undef FAIL
|
|
|
|
#define JSVAL_VECTOR(T) \
|
|
template<> void ScriptInterface::ToJSVal<std::vector<T> >(const ScriptRequest& rq, JS::MutableHandleValue ret, const std::vector<T>& val) \
|
|
{ \
|
|
ToJSVal_vector(rq, ret, val); \
|
|
} \
|
|
template<> bool ScriptInterface::FromJSVal<std::vector<T> >(const ScriptRequest& rq, JS::HandleValue v, std::vector<T>& out) \
|
|
{ \
|
|
return FromJSVal_vector(rq, v, out); \
|
|
}
|
|
|
|
template<typename T> bool ScriptInterface::FromJSProperty(const ScriptRequest& rq, const JS::HandleValue val, const char* name, T& ret, bool strict)
|
|
{
|
|
if (!val.isObject())
|
|
return false;
|
|
|
|
JS::RootedObject obj(rq.cx, &val.toObject());
|
|
|
|
bool hasProperty;
|
|
if (!JS_HasProperty(rq.cx, obj, name, &hasProperty) || !hasProperty)
|
|
return false;
|
|
|
|
JS::RootedValue value(rq.cx);
|
|
if (!JS_GetProperty(rq.cx, obj, name, &value))
|
|
return false;
|
|
|
|
if (strict && value.isNull())
|
|
return false;
|
|
|
|
return FromJSVal(rq, value, ret);
|
|
}
|
|
|
|
#endif //INCLUDED_SCRIPTCONVERSIONS
|