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

hacky workaround

Browse Source
This commit is contained in:
Mark Thom
2018-05-28 20:07:34 -06:00
parent b49c0f5d36
commit 07ec2d34c8
6 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/prolog/ast.rs
View File

@@ -166,7 +166,8 @@ pub fn default_op_dir() -> OpDir {
op_dir.insert((clause_name!(":-"), Fixity::In), (XFX, 1200, module_name.clone()));
op_dir.insert((clause_name!(":-"), Fixity::Pre), (FX, 1200, module_name.clone()));
op_dir.insert((clause_name!("?-"), Fixity::Pre), (FX, 1200, module_name.clone()));
op_dir.insert((clause_name!("?-"), Fixity::Pre), (FX, 1200, module_name.clone()));
op_dir.insert((clause_name!(","), Fixity::In), (XFY, 1000, module_name.clone()));
op_dir
}
@@ -548,29 +549,6 @@ impl Constant {
}
}
impl fmt::Display for Constant {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
&Constant::Atom(ref 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(ref n) =>
write!(f, "{}", n),
&Constant::String(ref s) =>
write!(f, "\"{}\"", s),
&Constant::Usize(integer) =>
write!(f, "u{}", integer)
}
}
}
#[derive(PartialEq, Eq, Clone)]
pub enum Term {
AnonVar,