diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2022-10-14 19:19:13 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2022-10-14 19:19:13 +0100 |
commit | bba072d95d9a020b03f60026d5a3fae788a03b0b (patch) | |
tree | 36436c01992a500f6003ea9df00a2c63fe13ba29 | |
parent | 54497fce49485f138211f6188009dc103b7e05cc (diff) | |
parent | cdb0e498a1453be2c77ddd3a11ba658f97ce0500 (diff) | |
download | swig-bba072d95d9a020b03f60026d5a3fae788a03b0b.tar.gz |
Merge branch 'fix-cast'
* fix-cast:
add tests for new casting behavior
skip tests when value is out of range
refactor integers JS testcase to avoid repeating code
Return uint64_t as double if is bigger than uint32_t
Use SWIG_TypeCast in SWIG_V8_ConvertInstancePtr if types don't match (#3)
-rw-r--r-- | Examples/test-suite/javascript/integers_runme.js | 32 | ||||
-rw-r--r-- | Lib/javascript/v8/javascriptprimtypes.swg | 4 |
2 files changed, 21 insertions, 15 deletions
diff --git a/Examples/test-suite/javascript/integers_runme.js b/Examples/test-suite/javascript/integers_runme.js index 0356176ad..4aeb13d7a 100644 --- a/Examples/test-suite/javascript/integers_runme.js +++ b/Examples/test-suite/javascript/integers_runme.js @@ -1,18 +1,24 @@ var integers = require("integers"); -var val = 3902408827 -ret = integers.signed_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret +function checkOne(val, signed, typeName) { + typeName = (signed ? 'signed_' : 'unsigned_') + typeName -ret = integers.unsigned_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret + var size = integers[typeName + '_size']() + if ((!signed && val < 0) || (size < 8)) + return // out of range, skip test -ret = integers.signed_long_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret + ret = integers[typeName + '_identity'](val) + if (ret !== val) + throw "Incorrect value: expected " + val + ", got " + ret +} -ret = integers.unsigned_long_long_identity(val) -if (ret != val) - throw "Incorrect value: " + ret +function checkAll(val) { + checkOne(val, true, 'long') + checkOne(val, false, 'long') + checkOne(val, true, 'long_long') + checkOne(val, false, 'long_long') +} + +checkAll(3902408827) +checkAll(Number.MAX_SAFE_INTEGER) +checkAll(Number.MIN_SAFE_INTEGER) 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<double>(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<double>(value)); } %#endif } |