From a4e882756e90530fc480c5e59dd8cb3d79dcb467 Mon Sep 17 00:00:00 2001 From: Mark Thom Date: Wed, 24 Oct 2018 23:16:49 -0600 Subject: [PATCH] fix tests --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/prolog/machine/machine_state_impl.rs | 2 ++ src/prolog/machine/term_expansion.rs | 4 ++++ src/tests.rs | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 544dcb55..22eb0d0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "rusty-wam" -version = "0.7.14" +version = "0.7.15" dependencies = [ "downcast 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index bb46aaf8..ca9e2fe5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rusty-wam" -version = "0.7.14" +version = "0.7.15" authors = ["Mark Thom "] repository = "https://github.com/mthom/rusty-wam" description = "The Warren Abstract Machine in Rust." diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs index 9d2beb5e..851e9800 100644 --- a/src/prolog/machine/machine_state_impl.rs +++ b/src/prolog/machine/machine_state_impl.rs @@ -132,7 +132,9 @@ impl MachineState { output.append(" = "); let mut printer = HCPrinter::from_heap_locs(&self, output, var_dir); + printer.numbervars = false; + printer.quoted = true; let mut output = printer.print(addr); diff --git a/src/prolog/machine/term_expansion.rs b/src/prolog/machine/term_expansion.rs index e815711a..17276380 100644 --- a/src/prolog/machine/term_expansion.rs +++ b/src/prolog/machine/term_expansion.rs @@ -126,6 +126,10 @@ impl MachineState { } else { let mut output = { let mut printer = HCPrinter::new(&self, PrinterOutputter::new()); + + printer.quoted = true; + printer.numbervars = true; + printer.print(Addr::HeapCell(h)) }; diff --git a/src/tests.rs b/src/tests.rs index d963f392..4910ff26 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -1871,7 +1871,7 @@ fn test_queries_on_dcgs() submit(&mut wam, ":- use_module(library(dcgs))."); - // test case by YeGoblynQueene on hacker news. + // test case by YeGoblynQueene from hacker news. compile_user_module(&mut wam, " ability(destroy, X) --> destroy(X). destroy(X) --> [destroy], target(X). -- 2.54.0