From: Mark Thom <markjordanthom@gmail.com>
Date: Fri, 28 Dec 2018 23:59:26 +0000 (-0700)
Subject: correct write_canonical/2 bug
X-Git-Tag: v0.8.110~304
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=2f2f6314d8457d6431938966e6b6a152101ee36c;p=scryer-prolog.git

correct write_canonical/2 bug
---

diff --git a/src/prolog/heap_print.rs b/src/prolog/heap_print.rs
index efca3742..5e9a3968 100644
--- a/src/prolog/heap_print.rs
+++ b/src/prolog/heap_print.rs
@@ -298,7 +298,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
         }
     }
 
-
     fn enqueue_op(&mut self, ct: ClauseType, fixity: Fixity) {
         match fixity {
             Fixity::Post => {
@@ -502,7 +501,11 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
             Constant::String(s) =>
                 if self.machine_st.machine_flags().double_quotes.is_chars() {
                     if !s.is_empty() {
-                        self.push_list();
+                        if self.ignore_ops {
+                            self.format_struct(2, clause_name!("."));
+                        } else {
+                            self.push_list();
+                        }
                     } else if s.is_expandable() {
                         if !self.at_cdr(" | _") {
                             self.outputter.push_char('_');
@@ -575,9 +578,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
                 self.print_constant(c, &op),
             HeapCellValue::Addr(Addr::Lis(_)) =>
                 if self.ignore_ops {
-                    self.format_struct(2, clause_name!("."))
+                    self.format_struct(2, clause_name!("."));
                 } else {
-                    self.push_list()
+                    self.push_list();
                 },
             HeapCellValue::Addr(addr) =>
                 if let Some(offset_str) = self.offset_as_string(addr) {
@@ -630,13 +633,13 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
                             delimit.set(false);
                         },
                     TokenOrRedirect::CloseList(delimit) =>
-                        if !self.ignore_ops && delimit.get() {
+                        if delimit.get() {
                             self.outputter.push_char(']');
                         },
                     TokenOrRedirect::HeadTailSeparator =>
-                        if !self.ignore_ops {
-                            self.outputter.append(" | ");
-                        },
+//                      if !self.ignore_ops {
+                            self.outputter.append(" | "),
+//                      },
                     TokenOrRedirect::Comma =>
                         self.outputter.append(", ")
                 }