From cf92349c1d709fb0e9d9ad38127c5ab1a03ec426 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 9 May 2020 22:28:32 +0200 Subject: [PATCH 1/2] Implemented Debug for the new data structures --- src/prolog/indexing.rs | 3 ++- src/prolog/machine/streams.rs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/prolog/indexing.rs b/src/prolog/indexing.rs index 75a47736..c03ff77a 100644 --- a/src/prolog/indexing.rs +++ b/src/prolog/indexing.rs @@ -11,13 +11,14 @@ use std::convert::TryFrom; use std::hash::Hash; use std::rc::Rc; -#[derive(Clone, Copy)] +#[derive(Debug, Clone, Copy)] enum IntIndex { External(usize), Fail, Internal(usize), } +#[derive(Debug)] pub struct CodeOffsets { atom_tbl: TabledData, pub constants: IndexMap, diff --git a/src/prolog/machine/streams.rs b/src/prolog/machine/streams.rs index 68b2ec3b..6a904aa0 100644 --- a/src/prolog/machine/streams.rs +++ b/src/prolog/machine/streams.rs @@ -59,6 +59,7 @@ pub enum EOFAction { Reset, } +#[derive(Debug)] pub enum AtEndOfStream { Not, End, From 1d313ebf253454abe6ec59489ca3c712a59ffe36 Mon Sep 17 00:00:00 2001 From: notoria Date: Sat, 9 May 2020 22:30:39 +0200 Subject: [PATCH 2/2] Removed the warnings --- src/prolog/heap_print.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/prolog/heap_print.rs b/src/prolog/heap_print.rs index b68a580a..606ae539 100644 --- a/src/prolog/heap_print.rs +++ b/src/prolog/heap_print.rs @@ -458,9 +458,9 @@ fn non_quoted_token>(mut iter: Iter) -> bool { } else if cut_char!(c) { iter.next().is_none() } else if c == '[' { - (iter.next() == Some(']') && iter.next().is_none()) + iter.next() == Some(']') && iter.next().is_none() } else if c == '{' { - (iter.next() == Some('}') && iter.next().is_none()) + iter.next() == Some('}') && iter.next().is_none() } else if solo_char!(c) { !(c == '(' || c == ')' || c == '}' || c == ']' || c == ',' || c == '%' || c == '|') } else {