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

update (^)/2 in light of Draft Technical Corrigendum 3 (#559)

Browse Source
This commit is contained in:
Mark Thom
2020-05-23 12:12:34 -06:00
parent 888d844ec5
commit f74005a166
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/prolog/machine/arithmetic_ops.rs
View File

@@ -398,7 +398,7 @@ impl MachineState {
match (n1, n2) {
(Number::Fixnum(n1), Number::Fixnum(n2)) => {
if n1 != 1 && n2 < -1 {
if !(n1 == 1 || n1 == 0 || n1 == -1) && n2 < 0 {
let n = Number::from(n1);
let stub = MachineError::functor_stub(clause_name!("^"), 2);
@@ -424,7 +424,7 @@ impl MachineState {
}
}
(Number::Fixnum(n1), Number::Integer(n2)) => {
if n1 != 1 && &*n2 < &-1 {
if (n1 == 1 || n1 == 0 || n1 == -1) && &*n2 < &0 {
let n = Number::from(n1);
let stub = MachineError::functor_stub(clause_name!("^"), 2);
@@ -442,7 +442,7 @@ impl MachineState {
}
}
(Number::Integer(n1), Number::Fixnum(n2)) => {
if &*n1 != &1 && n2 < -1 {
if !(&*n1 == &1 || &*n1 == &0 || &*n1 == &-1) && n2 < 0 {
let n = Number::Integer(n1);
let stub = MachineError::functor_stub(clause_name!("^"), 2);
@@ -460,7 +460,7 @@ impl MachineState {
}
}
(Number::Integer(n1), Number::Integer(n2)) => {
if &*n1 != &1 && &*n2 < &-1 {
if !(&*n1 == &1 || &*n1 == &0 || &*n1 == &-1) && &*n2 < &0 {
let n = Number::Integer(n1);
let stub = MachineError::functor_stub(clause_name!("^"), 2);