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

various fixes

Browse Source
This commit is contained in:
Mark Thom
2019-04-22 21:28:33 -06:00
parent 535465fcd4
commit a5dc7f2387
7 changed files with 148 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/machine/compile.rs
View File

@@ -123,8 +123,6 @@ fn compile_query(terms: Vec<QueryTerm>, queue: VecDeque<TopLevel>, flags: Machin
let mut code = try!(cg.compile_query(&terms));
compile_appendix(&mut code, &queue, false, flags)?;
print_code(&code);
Ok((code, cg.take_vars()))
}

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

@@ -676,19 +676,20 @@ impl MachineState {
};
}
pub(super) fn get_number(&self, at: &ArithmeticTerm) -> Result<Number, MachineStub> {
pub(super) fn get_number(&mut self, at: &ArithmeticTerm) -> Result<Number, MachineStub> {
match at {
&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()),
&ArithmeticTerm::Reg(r) =>
self.arith_eval_by_metacall(r),
&ArithmeticTerm::Interm(i) =>
Ok(mem::replace(&mut self.interms[i-1], Number::Integer(Rc::new(BigInt::zero())))),
&ArithmeticTerm::Number(ref n) =>
Ok(n.clone()),
}
}
fn get_rational(&self, at: &ArithmeticTerm, caller: &MachineStub)
-> Result<Rc<Ratio<BigInt>>, MachineStub>
fn rational_from_number(&self, n: Number, caller: &MachineStub)
-> Result<Rc<Ratio<BigInt>>, MachineStub>
{
let n = self.get_number(at)?;
match n {
Number::Rational(r) => Ok(r),
Number::Float(fl) =>
@@ -701,6 +702,13 @@ impl MachineState {
Ok(Rc::new(Ratio::from_integer((*bi).clone())))
}
}
fn get_rational(&mut self, at: &ArithmeticTerm, caller: &MachineStub)
-> Result<Rc<Ratio<BigInt>>, MachineStub>
{
let n = self.get_number(at)?;
self.rational_from_number(n, caller)
}
fn signed_bitwise_op<Op>(&self, n1: &BigInt, n2: &BigInt, f: Op) -> Rc<BigInt>
where Op: FnOnce(&BigUint, &BigUint) -> BigUint
@@ -736,8 +744,8 @@ impl MachineState {
"^" => interms.push(self.binary_pow(a1, a2)?),
"max" => interms.push(self.max(a1, a2)?),
"rdiv" => {
let r1 = self.get_rational(&ArithmeticTerm::Number(a1), &caller)?;
let r2 = self.get_rational(&ArithmeticTerm::Number(a2), &caller)?;
let r1 = self.rational_from_number(a1, &caller)?;
let r2 = self.rational_from_number(a2, &caller)?;
let result = Number::Rational(self.rdiv(r1, r2)?);
interms.push(result)