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

fix term_variables, add (^)/2 as an actual evaluable functor

Browse Source
This commit is contained in:
Mark Thom
2019-04-01 09:04:50 -06:00
parent 2240418a25
commit e3e0473b69
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/prolog/arithmetic.rs
View File

@@ -131,7 +131,8 @@ impl<'a> ArithmeticEvaluator<'a>
"div" => Ok(ArithmeticInstruction::FIDiv(a1, a2, t)), "div" => Ok(ArithmeticInstruction::FIDiv(a1, a2, t)),
"rdiv" => Ok(ArithmeticInstruction::RDiv(a1, a2, t)), "rdiv" => Ok(ArithmeticInstruction::RDiv(a1, a2, t)),
"*" => Ok(ArithmeticInstruction::Mul(a1, a2, t)), "*" => Ok(ArithmeticInstruction::Mul(a1, a2, t)),
"**" => Ok(ArithmeticInstruction::Pow(a1, a2, t)), "**" => Ok(ArithmeticInstruction::Pow(a1, a2, t)),
"^" => Ok(ArithmeticInstruction::IntPow(a1, a2, t)),
">>" => Ok(ArithmeticInstruction::Shr(a1, a2, t)), ">>" => Ok(ArithmeticInstruction::Shr(a1, a2, t)),
"<<" => Ok(ArithmeticInstruction::Shl(a1, a2, t)), "<<" => Ok(ArithmeticInstruction::Shl(a1, a2, t)),
"/\\" => Ok(ArithmeticInstruction::And(a1, a2, t)), "/\\" => Ok(ArithmeticInstruction::And(a1, a2, t)),

1
src/prolog/instructions.rs
View File

@@ -59,6 +59,7 @@ pub enum ArithmeticInstruction {
Sub(ArithmeticTerm, ArithmeticTerm, usize), Sub(ArithmeticTerm, ArithmeticTerm, usize),
Mul(ArithmeticTerm, ArithmeticTerm, usize), Mul(ArithmeticTerm, ArithmeticTerm, usize),
Pow(ArithmeticTerm, ArithmeticTerm, usize), Pow(ArithmeticTerm, ArithmeticTerm, usize),
IntPow(ArithmeticTerm, ArithmeticTerm, usize),
IDiv(ArithmeticTerm, ArithmeticTerm, usize), IDiv(ArithmeticTerm, ArithmeticTerm, usize),
Max(ArithmeticTerm, ArithmeticTerm, usize), Max(ArithmeticTerm, ArithmeticTerm, usize),
FIDiv(ArithmeticTerm, ArithmeticTerm, usize), FIDiv(ArithmeticTerm, ArithmeticTerm, usize),

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

@@ -714,6 +714,7 @@ impl MachineState {
"*" => interms.push(a1 * a2), "*" => interms.push(a1 * a2),
"/" => interms.push(self.div(a1, a2)?), "/" => interms.push(self.div(a1, a2)?),
"**" => interms.push(self.pow(a1, a2)?), "**" => interms.push(self.pow(a1, a2)?),
"^" => interms.push(self.pow(a1, a2)?),
"max" => interms.push(self.max(a1, a2)?), "max" => interms.push(self.max(a1, a2)?),
"rdiv" => { "rdiv" => {
let r1 = self.get_rational(&ArithmeticTerm::Number(a1), &caller)?; let r1 = self.get_rational(&ArithmeticTerm::Number(a1), &caller)?;
@@ -1009,13 +1010,20 @@ impl MachineState {
self.interms[t - 1] = try_or_fail!(self, self.max(n1, n2)); self.interms[t - 1] = try_or_fail!(self, self.max(n1, n2));
self.p += 1; self.p += 1;
}, },
&ArithmeticInstruction::Pow(ref a1, ref a2, t) => { &ArithmeticInstruction::IntPow(ref a1, ref a2, t) => {
let n1 = try_or_fail!(self, self.get_number(a1)); let n1 = try_or_fail!(self, self.get_number(a1));
let n2 = try_or_fail!(self, self.get_number(a2)); let n2 = try_or_fail!(self, self.get_number(a2));
self.interms[t - 1] = try_or_fail!(self, self.pow(n1, n2)); self.interms[t - 1] = try_or_fail!(self, self.pow(n1, n2));
self.p += 1; self.p += 1;
}, },
&ArithmeticInstruction::Pow(ref a1, ref a2, t) => {
let n1 = try_or_fail!(self, self.get_number(a1));
let n2 = try_or_fail!(self, self.get_number(a2));
self.interms[t - 1] = try_or_fail!(self, self.pow(n1, n2));
self.p += 1;
},
&ArithmeticInstruction::RDiv(ref a1, ref a2, t) => { &ArithmeticInstruction::RDiv(ref a1, ref a2, t) => {
let stub = MachineError::functor_stub(clause_name!("(rdiv)"), 2); let stub = MachineError::functor_stub(clause_name!("(rdiv)"), 2);

3
src/prolog/machine/system_calls.rs
View File

@@ -3,7 +3,6 @@ use prolog_parser::parser::{get_desc, get_clause_spec};
use prolog_parser::tabled_rc::*; use prolog_parser::tabled_rc::*;
use prolog::clause_types::*; use prolog::clause_types::*;
use prolog::heap_iter::*;
use prolog::heap_print::*; use prolog::heap_print::*;
use prolog::machine::copier::*; use prolog::machine::copier::*;
use prolog::machine::machine_errors::*; use prolog::machine::machine_errors::*;
@@ -1112,7 +1111,7 @@ impl MachineState {
let mut vars = Vec::new(); let mut vars = Vec::new();
{ {
let iter = HCPreOrderIterator::new(self, a1); let iter = self.acyclic_pre_order_iter(a1);
for item in iter { for item in iter {
match item { match item {

4
src/prolog/write.rs
View File

@@ -298,7 +298,9 @@ impl fmt::Display for ArithmeticInstruction {
&ArithmeticInstruction::Mul(ref a1, ref a2, ref t) => &ArithmeticInstruction::Mul(ref a1, ref a2, ref t) =>
write!(f, "mul {}, {}, @{}", a1, a2, t), write!(f, "mul {}, {}, @{}", a1, a2, t),
&ArithmeticInstruction::Pow(ref a1, ref a2, ref t) => &ArithmeticInstruction::Pow(ref a1, ref a2, ref t) =>
write!(f, "pow {}, {}, @{}", a1, a2, t), write!(f, "** {}, {}, @{}", a1, a2, t),
&ArithmeticInstruction::IntPow(ref a1, ref a2, ref t) =>
write!(f, "^ {}, {}, @{}", a1, a2, t),
&ArithmeticInstruction::Div(ref a1, ref a2, ref t) => &ArithmeticInstruction::Div(ref a1, ref a2, ref t) =>
write!(f, "div {}, {}, @{}", a1, a2, t), write!(f, "div {}, {}, @{}", a1, a2, t),
&ArithmeticInstruction::IDiv(ref a1, ref a2, ref t) => &ArithmeticInstruction::IDiv(ref a1, ref a2, ref t) =>