jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-cast'

Browse source 
* 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)
This commit is contained in:
William S Fulton 2022-10-14 19:19:13 +01:00
commit bba072d95d
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Examples/test-suite/javascript/integers_runme.js
View file

@ -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)

4
Lib/javascript/v8/javascriptprimtypes.swg
View file

@ -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
}