mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-27 13:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove i32

Browse Source 
It's better to use types from the standard library.
This commit is contained in:
phosit
2026-09-09 09:59:47 +02:00
parent b7c310535d
commit 3e7263f0db
39 changed files with 188 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/Conversions.cpp
+3 -3
View File
@@ -69,7 +69,7 @@ template<> bool FromJSVal<double>(const Request& rq, JS::HandleValue v, double&
return true;
}
template<> bool FromJSVal<i32>(const Request& rq, JS::HandleValue v, i32& out)
template<> bool FromJSVal<std::int32_t>(const Request& rq, JS::HandleValue v, std::int32_t& out)
{
FAIL_IF_NOT(v.isNumber(), v);
if (!JS::ToInt32(rq.cx, v, &out))
@@ -206,7 +206,7 @@ template<> void ToJSVal<double>(const Request&, JS::MutableHandleValue ret, cons
ret.set(JS::NumberValue(val));
}
template<> void ToJSVal<i32>(const Request&, JS::MutableHandleValue ret, const i32& val)
template<> void ToJSVal<std::int32_t>(const Request&, JS::MutableHandleValue ret, const std::int32_t& val)
{
ret.set(JS::NumberValue(val));
}
@@ -299,4 +299,4 @@ template<> bool Script::FromJSVal<std::vector<Entity>>(const Script::Request& rq
}
#undef FAIL
#undef FAIL_IF_NOT
#undef FAIL_IF_NOT
source/scriptinterface/tests/test_ScriptConversions.h
+12 -12
View File
@@ -126,13 +126,13 @@ public:
roundtrip<float>(1e9f, "1000000000");
roundtrip<float>(1e30f, "1.0000000150474662e+30");
roundtrip<i32>(0, "0");
roundtrip<i32>(123, "123");
roundtrip<i32>(-123, "-123");
roundtrip<i32>(JSVAL_INT_MAX - 1, "2147483646");
roundtrip<i32>(JSVAL_INT_MAX, "2147483647");
roundtrip<i32>(JSVAL_INT_MIN + 1, "-2147483647");
roundtrip<i32>(JSVAL_INT_MIN, "-2147483648");
roundtrip<std::int32_t>(0, "0");
roundtrip<std::int32_t>(123, "123");
roundtrip<std::int32_t>(-123, "-123");
roundtrip<std::int32_t>(JSVAL_INT_MAX - 1, "2147483646");
roundtrip<std::int32_t>(JSVAL_INT_MAX, "2147483647");
roundtrip<std::int32_t>(JSVAL_INT_MIN + 1, "-2147483647");
roundtrip<std::int32_t>(JSVAL_INT_MIN, "-2147483648");
roundtrip<u32>(0, "0");
roundtrip<u32>(123, "123");
@@ -181,11 +181,11 @@ public:
// using new uninitialized variables each time to be sure the test doesn't succeeed if ToJSVal doesn't touch the value at all.
JS::RootedValue val0(rq.cx), val1(rq.cx), val2(rq.cx), val3(rq.cx), val4(rq.cx), val5(rq.cx), val6(rq.cx), val7(rq.cx), val8(rq.cx);
Script::ToJSVal<i32>(rq, &val0, 0);
Script::ToJSVal<i32>(rq, &val1, JSVAL_INT_MAX - 1);
Script::ToJSVal<i32>(rq, &val2, JSVAL_INT_MAX);
Script::ToJSVal<i32>(rq, &val3, JSVAL_INT_MIN + 1);
Script::ToJSVal<i32>(rq, &val4, -(i64)2147483648u); // JSVAL_INT_MIN
Script::ToJSVal<std::int32_t>(rq, &val0, 0);
Script::ToJSVal<std::int32_t>(rq, &val1, JSVAL_INT_MAX - 1);
Script::ToJSVal<std::int32_t>(rq, &val2, JSVAL_INT_MAX);
Script::ToJSVal<std::int32_t>(rq, &val3, JSVAL_INT_MIN + 1);
Script::ToJSVal<std::int32_t>(rq, &val4, -(i64)2147483648u); // JSVAL_INT_MIN
TS_ASSERT(val0.isInt32());
TS_ASSERT(val1.isInt32());
TS_ASSERT(val2.isInt32());