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

remove is from inlined terms.

Browse Source
This commit is contained in:
Mark Thom
2017-11-13 13:35:34 -07:00
parent ded701436a
commit 4a51496981
4 changed files with 61 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/prolog/iterators.rs
View File

@@ -40,7 +40,7 @@ impl<'a> QueryIterator<'a> {
let state = IteratorState::Clause(0, ClauseType::Catch, terms);
QueryIterator { state_stack: vec![state] }
},
&QueryTerm::Inlined(InlinedQueryTerm::Is(ref terms)) => {
&QueryTerm::Is(ref terms) => {
let state = IteratorState::Clause(0, ClauseType::Is, terms);
QueryIterator { state_stack: vec![state] }
},
@@ -270,13 +270,12 @@ impl<'a> ChunkedIterator<'a>
arity = child_terms.len();
break;
},
&QueryTerm::Inlined(InlinedQueryTerm::Is(_)) => {
&QueryTerm::Is(_) => {
result.push(term);
arity = 2;
break;
},
&QueryTerm::Inlined(InlinedQueryTerm::IsAtomic(_))
| &QueryTerm::Inlined(InlinedQueryTerm::IsVar(_)) =>
&QueryTerm::Inlined(_) =>
result.push(term),
&QueryTerm::Cut => {
result.push(term);