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

add user_error stream (#917)

Browse Source
This commit is contained in:
Mark Thom
2021-04-30 21:58:03 -06:00
parent bba836dc31
commit d0b25de554
10 changed files with 228 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/machine/partial_string.rs
View File

@@ -409,13 +409,11 @@ pub(super) fn compare_pstr_prefixes<'a>(
let machine_st = i1.machine_st;
let check_focuses = || {
match (i1.focus(), i2.focus()) {
(Addr::EmptyList, Addr::EmptyList) => Some(Ordering::Equal),
(Addr::EmptyList, _) => Some(Ordering::Less),
(_, Addr::EmptyList) => Some(Ordering::Greater),
_ => None,
}
let check_focuses = || match (i1.focus(), i2.focus()) {
(Addr::EmptyList, Addr::EmptyList) => Some(Ordering::Equal),
(Addr::EmptyList, _) => Some(Ordering::Less),
(_, Addr::EmptyList) => Some(Ordering::Greater),
_ => None,
};
return match r1 {
@@ -430,12 +428,8 @@ pub(super) fn compare_pstr_prefixes<'a>(
unreachable!()
}
}
Some(PStrIteratee::Char(_)) => {
Some(ordering)
}
None => {
check_focuses()
}
Some(PStrIteratee::Char(_)) => Some(ordering),
None => check_focuses(),
};
}
}