gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Split JS conversions from ScriptInterface.

Browse Source 
All ToJSVal/FromJSVal definitions are put in a separate header.
Remove AssignOr[To/From]JSVal duplication.

The functions were already static so this is rather straightforward.

Follows 34b1920e7b and 2bae30c454

Differential Revision: https://code.wildfiregames.com/D3953
This was SVN commit r25428.
This commit is contained in:
wraitii
2021-05-13 09:43:33 +00:00
parent d798a2ec0e
commit 61e0aef0b4
40 changed files with 323 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/tests/test_ScriptInterface.h
+7 -7
View File
@@ -160,7 +160,7 @@ public:
// Test that a mutable handle value as return value works.
ScriptFunction::Call(rq, val, "inc", &out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(4, nbr);
ScriptFunction::Call(rq, val, "add", nbr, nbrVal);
@@ -169,13 +169,13 @@ public:
// GetProperty JS::RootedValue* overload
nbr = 0;
script.GetProperty(val, "0", &out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(nbr, 7);
// GetPropertyInt JS::RootedValue* overload
nbr = 0;
script.GetPropertyInt(val, 0, &out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(nbr, 7);
handle_templates_test(script, val, &out, nbrVal);
@@ -190,7 +190,7 @@ public:
ScriptFunction::CallVoid(rq, val, "setTo", nbrVal);
ScriptFunction::Call(rq, val, "inc", out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(4, nbr);
ScriptFunction::Call(rq, val, "add", nbr, nbrVal);
@@ -199,13 +199,13 @@ public:
// GetProperty JS::MutableHandleValue overload
nbr = 0;
script.GetProperty(val, "0", out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(nbr, 7);
// GetPropertyInt JS::MutableHandleValue overload
nbr = 0;
script.GetPropertyInt(val, 0, out);
ScriptInterface::FromJSVal(rq, out, nbr);
Script::FromJSVal(rq, out, nbr);
TS_ASSERT_EQUALS(nbr, 7);
}
@@ -263,7 +263,7 @@ public:
TS_ASSERT(script.Eval("f()", &out));
int outNbr = 0;
ScriptInterface::FromJSVal(rq, out, outNbr);
Script::FromJSVal(rq, out, outNbr);
TS_ASSERT_EQUALS(2, outNbr);
}
};