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

fix bug in is/2 code generation.

Browse Source
This commit is contained in:
Mark Thom
2018-02-05 22:33:25 -07:00
parent 9d5f897fed
commit f01997ba3f
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/prolog/codegen.rs
View File

@@ -100,7 +100,23 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
{ {
match self.marker.bindings().get(name) { match self.marker.bindings().get(name) {
Some(&VarData::Temp(_, t, _)) if t != 0 => RegType::Temp(t), Some(&VarData::Temp(_, t, _)) if t != 0 => RegType::Temp(t),
Some(&VarData::Perm(p)) if p != 0 => RegType::Perm(p), Some(&VarData::Perm(p)) if p != 0 =>
/* if let GenContext::Last(chunk_num) = term_loc {
let mut target = Vec::new();
self.marker.evacuate_arg(chunk_num, &mut target);
self.marker.reset_arg(arity);
self.marker.mark_var(name, Level::Shallow, vr, term_loc, &mut target);
if !target.is_empty() {
code.push(Line::Query(target));
}
vr.get().norm()
} else { */
RegType::Perm(p),
//},
_ => { _ => {
let mut target = Vec::new(); let mut target = Vec::new();
@@ -480,8 +496,17 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
match terms[0].as_ref() { match terms[0].as_ref() {
&Term::Var(ref vr, ref name) => { &Term::Var(ref vr, ref name) => {
let r = self.mark_non_callable(name, 2, term_loc, vr, code); let mut target = Vec::new();
code.push(is_call!(r, at.unwrap_or(interm!(1))));
self.marker.reset_arg(2);
self.marker.mark_var(name, Level::Shallow, vr,
term_loc, &mut target);
if !target.is_empty() {
code.push(Line::Query(target));
}
code.push(is_call!(temp_v!(1), at.unwrap_or(interm!(1))));
}, },
&Term::Constant(_, ref c @ Constant::Number(_)) => { &Term::Constant(_, ref c @ Constant::Number(_)) => {
code.push(query![put_constant!(Level::Shallow, code.push(query![put_constant!(Level::Shallow,