reivilibre/hornbeam
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Where possible, unreflect u64s to Value::Ints

Browse Source
This commit is contained in:
Olivier 'reivilibre' 2024-05-01 22:31:26 +01:00
parent 11316a9cfc
commit 407a6b267e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hornbeam_interpreter/src/engine.rs
View File

@ -59,6 +59,7 @@ lazy_static! {
static ref U8_TYPEID: TypeId = TypeId::of::<u8>();
static ref U16_TYPEID: TypeId = TypeId::of::<u16>();
static ref U32_TYPEID: TypeId = TypeId::of::<u32>();
static ref U64_TYPEID: TypeId = TypeId::of::<u64>();
static ref I8_TYPEID: TypeId = TypeId::of::<i8>();
static ref I16_TYPEID: TypeId = TypeId::of::<i16>();
static ref I32_TYPEID: TypeId = TypeId::of::<i32>();
@ -80,6 +81,16 @@ impl Value {
Value::Int(u16::from_reflect(reflect.deref()).unwrap() as i64)
} else if ti == *U32_TYPEID {
Value::Int(u32::from_reflect(reflect.deref()).unwrap() as i64)
} else if ti == *U64_TYPEID {
// If we can, convert it to a native i64 value
// If we can't (because it's bigger than i64::MAX),
// then we have no choice but to leave it as a reflective value... :/
// TODO I really don't like this but my hands are tied...
let value_u64 = u64::from_reflect(reflect.deref()).unwrap();
match i64::try_from(value_u64) {
Ok(value_i64) => Value::Int(value_i64),
Err(_cant) => Value::Reflective(reflect),
}
} else if ti == *I8_TYPEID {
Value::Int(i8::from_reflect(reflect.deref()).unwrap() as i64)
} else if ti == *I16_TYPEID {