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

tweak head check

Browse Source
This commit is contained in:
Mark Thom
2017-04-30 13:59:11 -06:00
parent 316e5c5c1a
commit e68e3cc1ad
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/prolog/debray_allocator.rs
View File

@@ -24,10 +24,10 @@ impl<'a> TermMarker<'a> {
} }
} }
fn occurs_shallowly_in_head(&self, var: &'a Var, term_loc: GenContext, r: usize) -> bool fn occurs_shallowly_in_head(&self, var: &'a Var, r: usize) -> bool
{ {
match (term_loc, self.bindings.get(var).unwrap()) { match self.bindings.get(var).unwrap() {
(GenContext::Head, &VarData::Temp(_, _, ref tvd)) => &VarData::Temp(_, _, ref tvd) =>
tvd.use_set.contains(&(GenContext::Head, r)), tvd.use_set.contains(&(GenContext::Head, r)),
_ => false _ => false
} }
@@ -304,11 +304,15 @@ impl<'a> TermMarker<'a> {
} }
}, },
Level::Deep if is_new_var => Level::Deep if is_new_var =>
if self.occurs_shallowly_in_head(var, term_loc, r.reg_num()) { if let GenContext::Head = term_loc {
target.push(Target::subterm_to_value(r)); if self.occurs_shallowly_in_head(var, r.reg_num()) {
target.push(Target::subterm_to_value(r));
} else {
target.push(Target::subterm_to_variable(r));
}
} else { } else {
target.push(Target::subterm_to_variable(r)); target.push(Target::subterm_to_variable(r));
}, },
Level::Deep => Level::Deep =>
target.push(Target::subterm_to_value(r)) target.push(Target::subterm_to_value(r))
}; };