rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move print_constant logic to heap_print.rs

Browse Source
This commit is contained in:
Mark Thom
2018-07-16 19:06:27 -06:00
parent f5e254dd64
commit c5e1a08214
5 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/prolog/io.rs
View File

@@ -23,32 +23,25 @@ impl fmt::Display for IndexPtr {
}
}
impl fmt::Display for ClauseName {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.as_str())
}
}
impl fmt::Display for Constant {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn print_atom(f: &mut fmt::Formatter, atom: &ClauseName) -> fmt::Result {
let non_quoted_token = |c| {
graphic_token_char!(c) || alpha_numeric_char!(c)
};
match atom.as_str() {
";" | "!" => write!(f, "{}", atom.as_str()),
s => if s.chars().all(non_quoted_token) {
write!(f, "{}", atom.as_str())
} else {
write!(f, "{}", "'".to_owned() + atom.as_str() + "'")
}
}
}
match self {
&Constant::Atom(ref atom) =>
print_atom(f, atom),
if atom.as_str().chars().any(|c| "`.$'\" ".contains(c)) {
write!(f, "'{}'", atom.as_str())
} else {
write!(f, "{}", atom.as_str())
},
&Constant::Char(c) =>
write!(f, "'{}'", c as u8),
&Constant::EmptyList =>
write!(f, "[]"),
&Constant::Number(Number::Float(ref fl)) if fl == &OrderedFloat(0f64) =>
write!(f, "0"),
&Constant::Number(ref n) =>
write!(f, "{}", n),
&Constant::String(ref s) =>
@@ -59,12 +52,6 @@ impl fmt::Display for Constant {
}
}
impl fmt::Display for ClauseName {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.as_str())
}
}
impl fmt::Display for FactInstruction {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {