From 6aeee8effc089ba21bb771dd329350ac5b0c755f Mon Sep 17 00:00:00 2001 From: Sergio Garcia Murillo Date: Fri, 5 Mar 2021 15:08:17 +0100 Subject: [PATCH 1/5] Use SWIG_TypeCast in SWIG_V8_ConvertInstancePtr if types don't match (#3) Use SWIG_TypeCast in SWIG_V8_ConvertInstancePtr if types don't match --- Lib/javascript/v8/javascriptrun.swg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg index 62c7bf829..45dd8fe28 100644 --- a/Lib/javascript/v8/javascriptrun.swg +++ b/Lib/javascript/v8/javascriptrun.swg @@ -289,8 +289,12 @@ SWIGRUNTIME int SWIG_V8_ConvertInstancePtr(SWIGV8_OBJECT objRef, void **ptr, swi if(!type_valid) { return SWIG_TypeError; } + int newmemory = 0; + *ptr = SWIG_TypeCast(tc, cdata->swigCObject, &newmemory); + } else { + *ptr = cdata->swigCObject; } - *ptr = cdata->swigCObject; + if(flags & SWIG_POINTER_DISOWN) { cdata->swigCMemOwn = false; } From 56e7455af91911c06210cf551729df61a428e5a6 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Murillo Date: Mon, 29 Nov 2021 16:08:03 +0100 Subject: [PATCH 2/5] Return uint64_t as double if is bigger than uint32_t --- Lib/javascript/v8/javascriptprimtypes.swg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/javascript/v8/javascriptprimtypes.swg b/Lib/javascript/v8/javascriptprimtypes.swg index 0af406b90..8ed571df1 100644 --- a/Lib/javascript/v8/javascriptprimtypes.swg +++ b/Lib/javascript/v8/javascriptprimtypes.swg @@ -81,7 +81,7 @@ int SWIG_AsVal_dec(long)(SWIGV8_VALUE obj, long* val) SWIGINTERNINLINE SWIGV8_VALUE SWIG_From_dec(unsigned long)(unsigned long value) { - return SWIGV8_INTEGER_NEW_UNS(value); + return value <= UINT32_MAX ? (SWIGV8_VALUE)SWIGV8_INTEGER_NEW_UNS(value) : (SWIGV8_VALUE)SWIGV8_NUMBER_NEW(static_cast(value)); } } @@ -149,7 +149,7 @@ int SWIG_AsVal_dec(long long)(SWIGV8_VALUE obj, long long* val) SWIGINTERNINLINE SWIGV8_VALUE SWIG_From_dec(unsigned long long)(unsigned long long value) { - return SWIGV8_INTEGER_NEW_UNS(value); + return value <= UINT32_MAX ? (SWIGV8_VALUE)SWIGV8_INTEGER_NEW_UNS(value) : (SWIGV8_VALUE)SWIGV8_NUMBER_NEW(static_cast(value)); } %#endif } From cf7733e4b8ccbd92e0aac4f5fa74a66b9dd024ca Mon Sep 17 00:00:00 2001 From: Alba Mendez Date: Mon, 10 Oct 2022 12:49:57 +0200 Subject: [PATCH 3/5] refactor integers JS testcase to avoid repeating code --- .../test-suite/javascript/integers_runme.js | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Examples/test-suite/javascript/integers_runme.js b/Examples/test-suite/javascript/integers_runme.js index 0356176ad..6cb896fbf 100644 --- a/Examples/test-suite/javascript/integers_runme.js +++ b/Examples/test-suite/javascript/integers_runme.js @@ -1,18 +1,16 @@ var integers = require("integers"); -var val = 3902408827 -ret = integers.signed_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret +function checkOne(val, fn) { + ret = fn(val) + if (ret !== val) + throw "Incorrect value: expected " + val + ", got " + ret +} -ret = integers.unsigned_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret +function checkAll(val) { + checkOne(val, integers.signed_long_identity) + checkOne(val, integers.unsigned_long_identity) + checkOne(val, integers.signed_long_long_identity) + checkOne(val, integers.unsigned_long_long_identity) +} -ret = integers.signed_long_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret - -ret = integers.unsigned_long_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret +checkAll(3902408827) From 5b02dc93d67ed3ca6098207835e1b06f3fd143f2 Mon Sep 17 00:00:00 2001 From: Alba Mendez Date: Mon, 10 Oct 2022 13:27:30 +0200 Subject: [PATCH 4/5] skip tests when value is out of range --- .../test-suite/javascript/integers_runme.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Examples/test-suite/javascript/integers_runme.js b/Examples/test-suite/javascript/integers_runme.js index 6cb896fbf..1feadaed0 100644 --- a/Examples/test-suite/javascript/integers_runme.js +++ b/Examples/test-suite/javascript/integers_runme.js @@ -1,16 +1,22 @@ var integers = require("integers"); -function checkOne(val, fn) { - ret = fn(val) +function checkOne(val, signed, typeName) { + typeName = (signed ? 'signed_' : 'unsigned_') + typeName + + var size = integers[typeName + '_size']() + if ((!signed && val < 0) || (size < 8)) + return // out of range, skip test + + ret = integers[typeName + '_identity'](val) if (ret !== val) throw "Incorrect value: expected " + val + ", got " + ret } function checkAll(val) { - checkOne(val, integers.signed_long_identity) - checkOne(val, integers.unsigned_long_identity) - checkOne(val, integers.signed_long_long_identity) - checkOne(val, integers.unsigned_long_long_identity) + checkOne(val, true, 'long') + checkOne(val, false, 'long') + checkOne(val, true, 'long_long') + checkOne(val, false, 'long_long') } checkAll(3902408827) From 55d7a513436bc61cc1ac1017a9c732b5a11a3209 Mon Sep 17 00:00:00 2001 From: Alba Mendez Date: Mon, 10 Oct 2022 12:50:12 +0200 Subject: [PATCH 5/5] add tests for new casting behavior more integers are preserved now --- Examples/test-suite/javascript/integers_runme.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Examples/test-suite/javascript/integers_runme.js b/Examples/test-suite/javascript/integers_runme.js index 1feadaed0..4aeb13d7a 100644 --- a/Examples/test-suite/javascript/integers_runme.js +++ b/Examples/test-suite/javascript/integers_runme.js @@ -20,3 +20,5 @@ function checkAll(val) { } checkAll(3902408827) +checkAll(Number.MAX_SAFE_INTEGER) +checkAll(Number.MIN_SAFE_INTEGER)