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

use existing bindings in compile_is (#1545)

Browse Source
This commit is contained in:
Mark Thom
2022-11-13 22:58:00 -07:00
parent d19a8d6b98
commit d16312a314
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/arithmetic.rs
View File

@@ -67,19 +67,6 @@ impl<'a> ArithInstructionIterator<'a> {
Term::Clause(cell, name, terms) => { Term::Clause(cell, name, terms) => {
TermIterState::Clause(Level::Shallow, 0, cell, *name, terms) TermIterState::Clause(Level::Shallow, 0, cell, *name, terms)
} }
/* match ClauseType::from(*name, terms.len()) {
ct @ ClauseType::Named(..) => {
Ok(TermIterState::Clause(Level::Shallow, 0, cell, ct, terms))
}
ct @ ClauseType::Inlined(InlinedClauseType::IsFloat(_)) => {
// let ct = ClauseType::Named(1, atom!("float"), CodeIndex::default());
Ok(TermIterState::Clause(Level::Shallow, 0, cell, ct, terms))
}
_ => Err(ArithmeticError::NonEvaluableFunctor(
Literal::Atom(*name),
terms.len(),
)),
}?,*/
Term::Literal(cell, cons) => TermIterState::Literal(Level::Shallow, cell, cons), Term::Literal(cell, cons) => TermIterState::Literal(Level::Shallow, cell, cons),
Term::Cons(..) | Term::PartialString(..) | Term::CompleteString(..) => { Term::Cons(..) | Term::PartialString(..) | Term::CompleteString(..) => {
return Err(ArithmeticError::NonEvaluableFunctor( return Err(ArithmeticError::NonEvaluableFunctor(
@@ -320,8 +307,7 @@ impl<'a> ArithmeticEvaluator<'a> {
src: &'a Term, src: &'a Term,
term_loc: GenContext, term_loc: GenContext,
arg: usize, arg: usize,
) -> Result<ArithCont, ArithmeticError> ) -> Result<ArithCont, ArithmeticError> {
{
let mut code = vec![]; let mut code = vec![];
let mut iter = src.iter()?; let mut iter = src.iter()?;
@@ -338,6 +324,9 @@ impl<'a> ArithmeticEvaluator<'a> {
&mut code, &mut code,
) )
} else if term_loc.is_last() || cell.get().norm().reg_num() == 0 { } else if term_loc.is_last() || cell.get().norm().reg_num() == 0 {
if let Some(r) = self.marker.get_binding(&name) {
r
} else {
self.marker.mark_var::<QueryInstruction>( self.marker.mark_var::<QueryInstruction>(
name.clone(), name.clone(),
lvl, lvl,
@@ -347,6 +336,7 @@ impl<'a> ArithmeticEvaluator<'a> {
); );
self.marker.get_binding(&name).unwrap() self.marker.get_binding(&name).unwrap()
}
} else { } else {
cell.get().norm() cell.get().norm()
}; };

6
src/codegen.rs
View File

@@ -747,7 +747,7 @@ impl<'b> CodeGenerator<'b> {
) -> Result<(), CompilationError> { ) -> Result<(), CompilationError> {
macro_rules! compile_expr { macro_rules! compile_expr {
($self:expr, $terms:expr, $term_loc:expr, $code:expr) => ({ ($self:expr, $terms:expr, $term_loc:expr, $code:expr) => ({
let (acode, at) = $self.compile_arith_expr(&$terms[1], 1, $term_loc, 2)?; let (acode, at) = $self.compile_arith_expr($terms, 1, $term_loc, 2)?;
$code.extend(acode.into_iter()); $code.extend(acode.into_iter());
at at
}); });
@@ -765,7 +765,7 @@ impl<'b> CodeGenerator<'b> {
code, code,
); );
compile_expr!(self, terms, term_loc, code) compile_expr!(self, &terms[1], term_loc, code)
} }
&Term::Literal(_, c @ Literal::Integer(_) | &Term::Literal(_, c @ Literal::Integer(_) |
c @ Literal::Float(_) | c @ Literal::Float(_) |
@@ -775,7 +775,7 @@ impl<'b> CodeGenerator<'b> {
code.push(instr!("put_constant", Level::Shallow, v, temp_v!(1))); code.push(instr!("put_constant", Level::Shallow, v, temp_v!(1)));
self.marker.advance_arg(); self.marker.advance_arg();
compile_expr!(self, terms, term_loc, code) compile_expr!(self, &terms[1], term_loc, code)
} }
_ => { _ => {
code.push(instr!("$fail", 0)); code.push(instr!("$fail", 0));