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

Merge pull request #1729 from aarroyoc/negative-shifts

Browse Source 
Negative shifts (fixes #1719 and #1718)
This commit is contained in:
Mark Thom
2023-02-02 06:25:52 +01:00
committed by GitHub
parent ce56a7303e 36b3150225
commit cc38cf15a4
1 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/machine/arithmetic_ops.rs
View File

@@ -633,7 +633,9 @@ pub(crate) fn shr(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
if let Ok(n2) = u32::try_from(n2_i) {
return Ok(Number::arena_from(n1 >> n2, arena));
} else {
} else if let Ok(n2) = u32::try_from(n2_i * -1) {
return Ok(Number::arena_from(n1 << n2, arena));
} else {
return Ok(Number::arena_from(n1 >> u32::max_value(), arena));
}
}
@@ -642,22 +644,34 @@ pub(crate) fn shr(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
match n2.to_u32() {
Some(n2) => Ok(Number::arena_from(n1 >> n2, arena)),
_ => Ok(Number::arena_from(n1 >> u32::max_value(), arena)),
_ => {
if let Some(n2) = Integer::from(&*n2 * -1).to_u32() {
Ok(Number::arena_from(n1 << n2, arena))
} else {
Ok(Number::arena_from(n1 >> u32::max_value(), arena))
}
},
}
}
(Number::Integer(n1), Number::Fixnum(n2)) => match u32::try_from(n2.get_num()) {
Ok(n2) => Ok(Number::arena_from(Integer::from(&*n1 >> n2), arena)),
_ => Ok(Number::arena_from(
Integer::from(&*n1 >> u32::max_value()),
arena,
)),
_ => {
if let Ok(n2) = u32::try_from(n2.get_num() * -1) {
Ok(Number::arena_from(Integer::from(&*n1 << n2), arena))
} else {
Ok(Number::arena_from(Integer::from(&*n1 >> u32::max_value()),arena))
}
},
},
(Number::Integer(n1), Number::Integer(n2)) => match n2.to_u32() {
Some(n2) => Ok(Number::arena_from(Integer::from(&*n1 >> n2), arena)),
_ => Ok(Number::arena_from(
Integer::from(&*n1 >> u32::max_value()),
arena,
)),
_ => {
if let Some(n2) = Integer::from(&*n2 * -1).to_u32() {
Ok(Number::arena_from(Integer::from(&*n1 << n2), arena))
} else {
Ok(Number::arena_from(Integer::from(&*n1 >> u32::max_value()), arena))
}
},
},
(Number::Integer(_), n2) => Err(numerical_type_error(ValidType::Integer, n2, stub_gen)),
(Number::Fixnum(_), n2) => Err(numerical_type_error(ValidType::Integer, n2, stub_gen)),
@@ -680,7 +694,9 @@ pub(crate) fn shl(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
if let Ok(n2) = u32::try_from(n2_i) {
return Ok(Number::arena_from(n1 << n2, arena));
} else {
} else if let Ok(n2) = u32::try_from(n2_i * -1) {
return Ok(Number::arena_from(n1 >> n2, arena));
} else {
return Ok(Number::arena_from(n1 << u32::max_value(), arena));
}
}
@@ -689,22 +705,34 @@ pub(crate) fn shl(n1: Number, n2: Number, arena: &mut Arena) -> Result<Number, M
match n2.to_u32() {
Some(n2) => Ok(Number::arena_from(n1 << n2, arena)),
_ => Ok(Number::arena_from(n1 << u32::max_value(), arena)),
_ => {
if let Some(n2) = Integer::from(&*n2 * -1).to_u32() {
Ok(Number::arena_from(n1 >> n2, arena))
} else {
Ok(Number::arena_from(n1 << u32::max_value(), arena))
}
}
}
}
(Number::Integer(n1), Number::Fixnum(n2)) => match u32::try_from(n2.get_num()) {
Ok(n2) => Ok(Number::arena_from(Integer::from(&*n1 << n2), arena)),
_ => Ok(Number::arena_from(
Integer::from(&*n1 << u32::max_value()),
arena,
)),
_ => {
if let Ok(n2) = u32::try_from(n2.get_num() * -1) {
Ok(Number::arena_from(Integer::from(&*n1 >> n2), arena))
} else {
Ok(Number::arena_from(Integer::from(&*n1 << u32::max_value()),arena))
}
}
},
(Number::Integer(n1), Number::Integer(n2)) => match n2.to_u32() {
Some(n2) => Ok(Number::arena_from(Integer::from(&*n1 << n2), arena)),
_ => Ok(Number::arena_from(
Integer::from(&*n1 << u32::max_value()),
arena,
)),
_ => {
if let Some(n2) = Integer::from(&*n2 * -1).to_u32() {
Ok(Number::arena_from(Integer::from(&*n1 >> n2), arena))
} else {
Ok(Number::arena_from(Integer::from(&*n1 << u32::max_value()),arena))
}
}
},
(Number::Integer(_), n2) => Err(numerical_type_error(ValidType::Integer, n2, stub_gen)),
(Number::Fixnum(_), n2) => Err(numerical_type_error(ValidType::Integer, n2, stub_gen)),