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

add register marking for non-callable/inlined predicates.

Browse Source
This commit is contained in:
Mark Thom
2017-11-12 23:43:42 -07:00
parent e0f2ca80b5
commit b1ae09d7aa
5 changed files with 63 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/prolog/arithmetic.rs
View File

@@ -84,8 +84,8 @@ impl<'a> ArithmeticEvaluator<'a> {
ArithmeticEvaluator { bindings, interm: Vec::new(), interm_c: 1 }
}
fn get_un_instr(name: &Atom, a1: ArithmeticTerm, t: usize)
-> Result<ArithmeticInstruction, ArithmeticError>
fn get_unary_instr(name: &Atom, a1: ArithmeticTerm, t: usize)
-> Result<ArithmeticInstruction, ArithmeticError>
{
match name.as_str() {
"-" => Ok(ArithmeticInstruction::Neg(a1, t)),
@@ -93,8 +93,8 @@ impl<'a> ArithmeticEvaluator<'a> {
}
}
fn gen_bin_instr(name: &Atom, a1: ArithmeticTerm, a2: ArithmeticTerm, t: usize)
-> Result<ArithmeticInstruction, ArithmeticError>
fn gen_binary_instr(name: &Atom, a1: ArithmeticTerm, a2: ArithmeticTerm, t: usize)
-> Result<ArithmeticInstruction, ArithmeticError>
{
match name.as_str() {
"+" => Ok(ArithmeticInstruction::Add(a1, a2, t)),
@@ -129,7 +129,7 @@ impl<'a> ArithmeticEvaluator<'a> {
a1.interm_or(0)
};
Self::get_un_instr(name, a1, ninterm)
Self::get_unary_instr(name, a1, ninterm)
},
2 => {
let a2 = self.interm.pop().unwrap();
@@ -153,7 +153,7 @@ impl<'a> ArithmeticEvaluator<'a> {
min_interm
};
Self::gen_bin_instr(name, a1, a2, ninterm)
Self::gen_binary_instr(name, a1, a2, ninterm)
},
_ => Err(ArithmeticError::InvalidOp)
}
@@ -221,7 +221,7 @@ impl<'a> ArithmeticEvaluator<'a> {
_ => {}
};
}
Ok(code)
}
}