correct delayed evaluation for negation, rational decls

diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs
index f33d87b3dabf6f4e4d043114435fa75a614e2a6e..640495f4eaaba62218b866a5fb62d97110d7b19a 100644 (file)
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -262,15 +262,7 @@ impl MachineState {
 
     fn get_number(&self, at: &ArithmeticTerm) -> Result<Number, Vec<HeapCellValue>> {
         match at {
-            &ArithmeticTerm::Reg(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::Reg(r) =>        self.arith_eval_by_metacall(r),
             &ArithmeticTerm::Interm(i)     => Ok(self.interms[i-1].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),
-                        "rdiv" =>
-                            match NumberPair::from(a1, a2) {
-                                NumberPair::Rational(r1, r2) =>
-                                    interms.push(Number::Rational(self.rdiv(r1, r2)?)),
-                                _ =>
-                                    return Err(instantiation_err)
-                            },
+                        "rdiv" => {
+                            let r1 = self.get_rational(&ArithmeticTerm::Number(a1))?;
+                            let r2 = self.get_rational(&ArithmeticTerm::Number(a2))?;
+
+                            let result = Number::Rational(self.rdiv(r1, r2)?);
+                            interms.push(result)
+                        },
                         "//"  => interms.push(Number::Integer(self.idiv(a1, a2)?)),
                         "div" => interms.push(Number::Integer(self.fidiv(a1, a2)?)),
                         ">>"  => interms.push(Number::Integer(self.shr(a1, a2)?)),