[oden-js] Fix cross-platform conversions
Lots of places were assuming that bool and c int were interchangeable, but of course on windows a c int is 32 bits and that confused everybody. Tighten up the definitions in static-functions, which causes us to fix boolean conversion. Also add tests for boolean conversion, and also add better debug formatting of JS values.
This commit is contained in:
parent
0cb5944d0a
commit
6200ed31b6
5 changed files with 82 additions and 31 deletions
|
|
@ -7,9 +7,34 @@ include!("static-functions.rs");
|
|||
|
||||
use std::fmt;
|
||||
|
||||
fn tag_name(tag: i64) -> &'static str {
|
||||
match tag.try_into() {
|
||||
Ok(tag) => match tag {
|
||||
JS_TAG_BIG_DECIMAL => "JS_TAG_BIG_DECIMAL",
|
||||
JS_TAG_BIG_INT => "JS_TAG_BIG_INT",
|
||||
JS_TAG_BIG_FLOAT => "JS_TAG_BIG_FLOAT",
|
||||
JS_TAG_SYMBOL => "JS_TAG_SYMBOL",
|
||||
JS_TAG_MODULE => "JS_TAG_MODULE",
|
||||
JS_TAG_FUNCTION_BYTECODE => "JS_TAG_FUNCTION_BYTECODE",
|
||||
JS_TAG_STRING => "JS_TAG_STRING",
|
||||
JS_TAG_OBJECT => "JS_TAG_OBJECT",
|
||||
JS_TAG_INT => "JS_TAG_INT",
|
||||
JS_TAG_BOOL => "JS_TAG_BOOL",
|
||||
JS_TAG_NULL => "JS_TAG_NULL",
|
||||
JS_TAG_UNDEFINED => "JS_TAG_UNDEFINED",
|
||||
JS_TAG_UNINITIALIZED => "JS_TAG_UNINITIALIZED",
|
||||
JS_TAG_CATCH_OFFSET => "JS_TAG_CATCH_OFFSET",
|
||||
JS_TAG_EXCEPTION => "JS_TAG_EXCEPTION",
|
||||
JS_TAG_FLOAT64 => "JS_TAG_FLOAT64",
|
||||
_ => "???",
|
||||
},
|
||||
Err(_) => "???",
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for JSValue {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "JS[{}", self.tag)?;
|
||||
write!(f, "JS[{} ({})", tag_name(self.tag), self.tag)?;
|
||||
if self.tag < 0 {
|
||||
write!(f, " {:?}]", unsafe { self.u.ptr })
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@ extern "C" {
|
|||
fn JS_DupValueRT_real(rt: *mut JSRuntime, v: JSValue);
|
||||
fn JS_FreeValue_real(ctx: *mut JSContext, v: JSValue);
|
||||
fn JS_FreeValueRT_real(rt: *mut JSRuntime, v: JSValue);
|
||||
fn JS_NewBool_real(ctx: *mut JSContext, v: bool) -> JSValue;
|
||||
fn JS_NewBool_real(ctx: *mut JSContext, v: ::std::os::raw::c_int) -> JSValue;
|
||||
fn JS_NewInt32_real(ctx: *mut JSContext, v: i32) -> JSValue;
|
||||
fn JS_NewUint32_real(ctx: *mut JSContext, v: u32) -> JSValue;
|
||||
fn JS_NewFloat64_real(ctx: *mut JSContext, v: f64) -> JSValue;
|
||||
fn JS_VALUE_IS_NAN_real(v: JSValue) -> bool;
|
||||
fn JS_VALUE_IS_NAN_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_VALUE_GET_FLOAT64_real(v: JSValue) -> f64;
|
||||
fn JS_VALUE_GET_NORM_TAG_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsNumber_real(v: JSValue) -> bool;
|
||||
fn JS_IsBigInt_real(ctx: *mut JSContext, v: JSValue) -> bool;
|
||||
fn JS_IsBigFloat_real(v: JSValue) -> bool;
|
||||
fn JS_IsBigDecimal_real(v: JSValue) -> bool;
|
||||
fn JS_IsBool_real(v: JSValue) -> bool;
|
||||
fn JS_IsNull_real(v: JSValue) -> bool;
|
||||
fn JS_IsUndefined_real(v: JSValue) -> bool;
|
||||
fn JS_IsException_real(v: JSValue) -> bool;
|
||||
fn JS_IsUninitialized_real(v: JSValue) -> bool;
|
||||
fn JS_IsString_real(v: JSValue) -> bool;
|
||||
fn JS_IsSymbol_real(v: JSValue) -> bool;
|
||||
fn JS_IsObject_real(v: JSValue) -> bool;
|
||||
fn JS_IsNumber_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsBigInt_real(ctx: *mut JSContext, v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsBigFloat_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsBigDecimal_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsBool_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsNull_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsUndefined_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsException_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsUninitialized_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsString_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsSymbol_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_IsObject_real(v: JSValue) -> ::std::os::raw::c_int;
|
||||
fn JS_ToUint32_real(ctx: *mut JSContext, pres: *mut u32, val: JSValue) -> i32;
|
||||
fn JS_GetProperty_real(ctx: *mut JSContext, this_obj: JSValue, prop: JSAtom) -> JSValue;
|
||||
fn JS_SetProperty_real(
|
||||
|
|
@ -82,7 +82,7 @@ pub unsafe fn JS_FreeValueRT(rt: *mut JSRuntime, v: JSValue) {
|
|||
}
|
||||
|
||||
/// create a new boolean value
|
||||
pub unsafe fn JS_NewBool(ctx: *mut JSContext, v: bool) -> JSValue {
|
||||
pub unsafe fn JS_NewBool(ctx: *mut JSContext, v: ::std::os::raw::c_int) -> JSValue {
|
||||
JS_NewBool_real(ctx, v)
|
||||
}
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ pub unsafe fn JS_NewFloat64(ctx: *mut JSContext, v: f64) -> JSValue {
|
|||
}
|
||||
|
||||
/// check if a JSValue is a NaN value
|
||||
pub unsafe fn JS_VALUE_IS_NAN(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_VALUE_IS_NAN(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_VALUE_IS_NAN_real(v)
|
||||
}
|
||||
|
||||
|
|
@ -117,62 +117,62 @@ pub unsafe fn JS_VALUE_GET_NORM_TAG(v: JSValue) -> ::std::os::raw::c_int {
|
|||
}
|
||||
|
||||
/// check if a JSValue is a Number
|
||||
pub unsafe fn JS_IsNumber(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsNumber(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsNumber_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a BigInt
|
||||
pub unsafe fn JS_IsBigInt(ctx: *mut JSContext, v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsBigInt(ctx: *mut JSContext, v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsBigInt_real(ctx, v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a BigFloat
|
||||
pub unsafe fn JS_IsBigFloat(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsBigFloat(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsBigFloat_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a BigDecimal
|
||||
pub unsafe fn JS_IsBigDecimal(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsBigDecimal(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsBigDecimal_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a Boolean
|
||||
pub unsafe fn JS_IsBool(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsBool(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsBool_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is null
|
||||
pub unsafe fn JS_IsNull(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsNull(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsNull_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is Undefined
|
||||
pub unsafe fn JS_IsUndefined(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsUndefined(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsUndefined_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is an Exception
|
||||
pub unsafe fn JS_IsException(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsException(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsException_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is initialized
|
||||
pub unsafe fn JS_IsUninitialized(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsUninitialized(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsUninitialized_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a String
|
||||
pub unsafe fn JS_IsString(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsString(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsString_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is a Symbol
|
||||
pub unsafe fn JS_IsSymbol(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsSymbol(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsSymbol_real(v)
|
||||
}
|
||||
|
||||
/// check if a JSValue is an Object
|
||||
pub unsafe fn JS_IsObject(v: JSValue) -> bool {
|
||||
pub unsafe fn JS_IsObject(v: JSValue) -> ::std::os::raw::c_int {
|
||||
JS_IsObject_real(v)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue