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

printer: abbreviate lists with |

Browse Source
This commit is contained in:
Mark Thom
2019-04-26 09:48:12 -06:00
parent 3783070585
commit 7bda7c5bf3
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "scryer-prolog" name = "scryer-prolog"
version = "0.8.66" version = "0.8.67"
authors = ["Mark Thom <markjordanthom@gmail.com>"] authors = ["Mark Thom <markjordanthom@gmail.com>"]
repository = "https://github.com/mthom/scryer-prolog" repository = "https://github.com/mthom/scryer-prolog"
description = "A modern Prolog implementation written mostly in Rust." description = "A modern Prolog implementation written mostly in Rust."

8
src/prolog/heap_print.rs
View File

@@ -609,11 +609,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
self.cyclic_terms.insert(addr, reps - 1); self.cyclic_terms.insert(addr, reps - 1);
iter.next() iter.next()
} else { } else {
if !self.at_cdr(", ...") { push_space_if_amb!(self, "...", {
push_space_if_amb!(self, "...", { self.append_str("...");
self.append_str("..."); });
});
}
iter.stack().pop(); iter.stack().pop();
self.cyclic_terms.remove(&addr); self.cyclic_terms.remove(&addr);

2
src/tests.rs
View File

@@ -1638,7 +1638,7 @@ fn test_queries_on_builtins()
assert_prolog_failure!(&mut wam, "Pairs = [a-a|Pairs], keysort(Pairs, _)."); assert_prolog_failure!(&mut wam, "Pairs = [a-a|Pairs], keysort(Pairs, _).");
assert_prolog_success!(&mut wam, "Pairs = [a-a|Pairs], catch(keysort(Pairs, _), error(E, _), true).", assert_prolog_success!(&mut wam, "Pairs = [a-a|Pairs], catch(keysort(Pairs, _), error(E, _), true).",
[["E = type_error(list, [a-a, a-a, a-a, ...])", "Pairs = [a-a | Pairs]"]]); [["E = type_error(list, [a-a, a-a, a-a | ...])", "Pairs = [a-a | Pairs]"]]);
assert_prolog_success!(&mut wam, "keysort([], L).", assert_prolog_success!(&mut wam, "keysort([], L).",
[["L = []"]]); [["L = []"]]);