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

fix errors emitted by sort and keysort, add tests, add support for Max = -1 to '$skip_max_list'

Browse Source
This commit is contained in:
Mark Thom
2018-05-03 20:15:45 -06:00
parent 29356fbc3b
commit 11800532c9
4 changed files with 285 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/prolog/machine/machine_state.rs
View File

@@ -484,10 +484,11 @@ pub(crate) trait CallPolicy: Any {
return_from_clause!(lco, machine_st)
},
&ClauseType::Sort => {
let mut list = machine_st.try_from_list(temp_v!(1))?;
machine_st.check_sort_errors()?;
let stub = machine_st.functor_stub(clause_name!("sort"), 2);
let mut list = machine_st.try_from_list(temp_v!(1), stub)?;
list.sort_unstable_by(|a1, a2| machine_st.compare_term_test(a1, a2));
machine_st.term_dedup(&mut list);
@@ -499,11 +500,12 @@ pub(crate) trait CallPolicy: Any {
return_from_clause!(lco, machine_st)
},
&ClauseType::KeySort => {
let mut list = machine_st.try_from_list(temp_v!(1))?;
let mut key_pairs = Vec::new();
machine_st.check_keysort_errors()?;
let stub = machine_st.functor_stub(clause_name!("keysort"), 2);
let mut list = machine_st.try_from_list(temp_v!(1), stub)?;
let mut key_pairs = Vec::new();
for val in list {
let key = machine_st.project_onto_key(val.clone())?;
key_pairs.push((key, val.clone()));
@@ -551,7 +553,7 @@ pub(crate) trait CallPolicy: Any {
Ok(())
},
&ClauseType::SkipMaxList => {
machine_st.skip_max_list();
machine_st.skip_max_list()?;
machine_st.p += 1;
Ok(())