rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix shr crash (#2158)

Browse Source
This commit is contained in:
Mark Thom
2023-11-14 08:10:12 +01:00
parent 300f5f817f
commit 4be320abc8
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/machine/arithmetic_ops.rs
View File

@@ -711,11 +711,8 @@ pub(crate) fn shl(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
(Number::Fixnum(n1), Number::Integer(n2)) => { (Number::Fixnum(n1), Number::Integer(n2)) => {
let n1 = Integer::from(n1.get_num()); let n1 = Integer::from(n1.get_num());
match (&*n2).try_into() as Result<u32, _> { match (&*n2).try_into() as Result<usize, _> {
Ok(n2) => { Ok(n2) => Ok(Number::arena_from(n1 << n2, arena)),
let n1: u64 = n1.try_into().unwrap();
Ok(Number::arena_from(n1 << n2, arena))
}
_ => Ok(Number::arena_from(n1 << usize::max_value(), arena)), _ => Ok(Number::arena_from(n1 << usize::max_value(), arena)),
} }
} }
@@ -726,11 +723,8 @@ pub(crate) fn shl(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
arena, arena,
)), )),
}, },
(Number::Integer(n1), Number::Integer(n2)) => match (&*n2).try_into() as Result<u32, _> { (Number::Integer(n1), Number::Integer(n2)) => match (&*n2).try_into() as Result<usize, _> {
Ok(n2) => { Ok(n2) => Ok(Number::arena_from(Integer::from(&*n1 << n2), arena)),
let n1: u64 = (&*n1).try_into().unwrap();
Ok(Number::arena_from(Integer::from(n1 << n2), arena))
}
_ => Ok(Number::arena_from( _ => Ok(Number::arena_from(
Integer::from(&*n1 << usize::max_value()), Integer::from(&*n1 << usize::max_value()),
arena, arena,