]> Repositorios git - scryer-prolog.git/commitdiff
printer: abbreviate lists with |
authorMark Thom <[email protected]>
Fri, 26 Apr 2019 15:48:12 +0000 (09:48 -0600)
committerMark Thom <[email protected]>
Fri, 26 Apr 2019 15:48:12 +0000 (09:48 -0600)
Cargo.toml
src/prolog/heap_print.rs
src/tests.rs

index a70338869b85d9f3babb68d9ae2afb80fa6ccfb6..8374e5be0340d0b291fe501b17127696a0d5e02d 100644 (file)
@@ -1,6 +1,6 @@
 [package]
 name = "scryer-prolog"
-version = "0.8.66"
+version = "0.8.67"
 authors = ["Mark Thom <[email protected]>"]
 repository = "https://github.com/mthom/scryer-prolog"
 description = "A modern Prolog implementation written mostly in Rust."
index 8757b3b77309bdffc71e509cda723f2dfb227a94..431f698ba00be6518bffed7803e212e8f602c1a1 100644 (file)
@@ -609,11 +609,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
                                 self.cyclic_terms.insert(addr, reps - 1);
                                 iter.next()
                             } else {                                
-                                if !self.at_cdr(", ...") {
-                                    push_space_if_amb!(self, "...", {
-                                        self.append_str("...");
-                                    });
-                                }
+                                push_space_if_amb!(self, "...", {
+                                    self.append_str("...");
+                                });
 
                                 iter.stack().pop();
                                 self.cyclic_terms.remove(&addr);
index 46e09ff958935666f07433fc0833059da7dfd567..5f9e8270374efdfacadba6d0884fbaf28749aa94 100644 (file)
@@ -1638,7 +1638,7 @@ fn test_queries_on_builtins()
 
     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).",
-                           [["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).",
                            [["L = []"]]);