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

correct delayed evaluation for negation, rational decls

Browse Source
This commit is contained in:
Mark Thom
2018-03-17 19:04:13 -06:00
parent 23afcdd6d4
commit 9430bee825
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/prolog/machine/machine_state_impl.rs
View File

@@ -262,15 +262,7 @@ impl MachineState {
fn get_number(&self, at: &ArithmeticTerm) -> Result<Number, Vec<HeapCellValue>> { fn get_number(&self, at: &ArithmeticTerm) -> Result<Number, Vec<HeapCellValue>> {
match at { match at {
&ArithmeticTerm::Reg(r) => { &ArithmeticTerm::Reg(r) => self.arith_eval_by_metacall(r),
let addr = self[r].clone();
let item = self.store(self.deref(addr));
match item {
Addr::Con(Constant::Number(n)) => Ok(n),
_ => Err(functor!("instantiation_error", 1, [heap_atom!("(is)/2")]))
}
},
&ArithmeticTerm::Interm(i) => Ok(self.interms[i-1].clone()), &ArithmeticTerm::Interm(i) => Ok(self.interms[i-1].clone()),
&ArithmeticTerm::Number(ref n) => Ok(n.clone()), &ArithmeticTerm::Number(ref n) => Ok(n.clone()),
} }
@@ -325,13 +317,13 @@ impl MachineState {
"+" => interms.push(a1 + a2), "+" => interms.push(a1 + a2),
"-" => interms.push(a1 - a2), "-" => interms.push(a1 - a2),
"*" => interms.push(a1 * a2), "*" => interms.push(a1 * a2),
"rdiv" => "rdiv" => {
match NumberPair::from(a1, a2) { let r1 = self.get_rational(&ArithmeticTerm::Number(a1))?;
NumberPair::Rational(r1, r2) => let r2 = self.get_rational(&ArithmeticTerm::Number(a2))?;
interms.push(Number::Rational(self.rdiv(r1, r2)?)),
_ => let result = Number::Rational(self.rdiv(r1, r2)?);
return Err(instantiation_err) interms.push(result)
}, },
"//" => interms.push(Number::Integer(self.idiv(a1, a2)?)), "//" => interms.push(Number::Integer(self.idiv(a1, a2)?)),
"div" => interms.push(Number::Integer(self.fidiv(a1, a2)?)), "div" => interms.push(Number::Integer(self.fidiv(a1, a2)?)),
">>" => interms.push(Number::Integer(self.shr(a1, a2)?)), ">>" => interms.push(Number::Integer(self.shr(a1, a2)?)),