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

correct non-termination of expand_goal and expand_term

Browse Source
This commit is contained in:
Mark Thom
2018-12-14 19:10:38 -07:00
parent e90669d159
commit 47a1cfaddc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/prolog/instructions.rs
View File

@@ -914,12 +914,14 @@ impl PartialOrd<CodePtr> for CodePtr {
impl PartialOrd<LocalCodePtr> for LocalCodePtr { impl PartialOrd<LocalCodePtr> for LocalCodePtr {
fn partial_cmp(&self, other: &LocalCodePtr) -> Option<Ordering> { fn partial_cmp(&self, other: &LocalCodePtr) -> Option<Ordering> {
match (self, other) { match (self, other) {
(&LocalCodePtr::DirEntry(p1), &LocalCodePtr::DirEntry(p2)) => (&LocalCodePtr::InSituDirEntry(p1), &LocalCodePtr::DirEntry(ref p2))
p1.partial_cmp(&p2), | (&LocalCodePtr::DirEntry(p1), &LocalCodePtr::DirEntry(ref p2))
(&LocalCodePtr::DirEntry(..), &LocalCodePtr::TopLevel(_, _)) => | (&LocalCodePtr::UserTermExpansion(p1), &LocalCodePtr::UserTermExpansion(ref p2))
Some(Ordering::Less), | (&LocalCodePtr::UserGoalExpansion(p1), &LocalCodePtr::UserGoalExpansion(ref p2))
(&LocalCodePtr::TopLevel(_, p1), &LocalCodePtr::TopLevel(_, ref p2)) => | (&LocalCodePtr::TopLevel(_, p1), &LocalCodePtr::TopLevel(_, ref p2)) =>
p1.partial_cmp(p2), p1.partial_cmp(p2),
(_, &LocalCodePtr::TopLevel(_, _)) =>
Some(Ordering::Less),
_ => Some(Ordering::Greater) _ => Some(Ordering::Greater)
} }
} }