fix conformity errors

diff --git a/Cargo.lock b/Cargo.lock
index 24feaf871dad5a8545e5a89254bae7a4806abb78..544dcb55377c19e1af648a124c27505be77adf2e 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "prolog_parser"
-version = "0.7.17"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -113,7 +113,7 @@ 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)",
  "ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "prolog_parser 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "prolog_parser 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -152,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-traits 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "cacfcab5eb48250ee7d0c7896b51a2c5eec99c1feea5f32025635f5ae4b00070"
 "checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
 "checksum ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58d25b6c0e47b20d05226d288ff434940296e7e2f8b877975da32f862152241f"
-"checksum prolog_parser 0.7.17 (registry+https://github.com/rust-lang/crates.io-index)" = "221eed4744a63708fac45edb126b86f8ef2713757bc647dfcda4ee51c8ef57c1"
+"checksum prolog_parser 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "fc54110ca6a70b5b509f14826af44b97fa6d7a0832d97229e7de3b73224d2c33"
 "checksum redox_syscall 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ab105df655884ede59d45b7070c8a65002d921461ee813a024558ca16030eea0"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"

diff --git a/Cargo.toml b/Cargo.toml
index 32e20b30fb4b27a0d52ab89e3780f6e4ee4eb7bc..bb46aaf839b608dcdf0851b7b34f91394743a496 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ license = "BSD-3-Clause"
 downcast = "0.9.1"
 num = "0.2"
 ordered-float = "0.5.0"
-prolog_parser = "0.7.17"
+prolog_parser = "0.7.18"
 
 [dependencies.termion]
 version = "1.4.0"
\ No newline at end of file

diff --git a/src/prolog/heap_print.rs b/src/prolog/heap_print.rs
index 211f24e09a8335fef14faa16f8f5ea0a18ec1721..0b83b406c8e62a5937fee553a60b1131467fcbef 100644 (file)
--- a/src/prolog/heap_print.rs
+++ b/src/prolog/heap_print.rs
@@ -113,6 +113,7 @@ impl HCValueOutputter for PrinterOutputter {
 // the 'classic' display corresponding to the display predicate.
 pub struct WriteqFormatter {}
 
+#[inline]
 fn is_numbered_var(ct: &ClauseType, arity: usize) -> bool {
     arity == 1 && if let &ClauseType::Named(ref name, _) = ct {
         name.as_str() == "$VAR"
@@ -419,10 +420,11 @@ impl<'a, Formatter: HCValueFormatter, Outputter: HCValueOutputter>
             '\u{0c}' => self.outputter.append("\\f"), // UTF-8 form feed
             '\u{08}' => self.outputter.append("\\b"), // UTF-8 backspace
             '\u{07}' => self.outputter.append("\\a"), // UTF-8 alert
-            _ => self.outputter.push_char(c)
+            '\x20' ..= '\x7e' => self.outputter.push_char(c),
+            _ => self.outputter.append(&format!("\\x{:x}", c as u32))
         };
     }
-
+    
     fn print_constant(&mut self, c: Constant, op: &Option<DirectedOp>) {
         match c {
             Constant::Atom(ref atom, Some(fixity)) => {