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

correct conformity error

Browse Source
This commit is contained in:
Mark Thom
2018-09-16 14:21:50 -06:00
parent f226cb3dbd
commit 8eb327c735
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -108,7 +108,7 @@ dependencies = [
[[package]] [[package]]
name = "rusty-wam" name = "rusty-wam"
version = "0.7.12" version = "0.7.13"
dependencies = [ dependencies = [
"downcast 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "rusty-wam" name = "rusty-wam"
version = "0.7.12" version = "0.7.13"
authors = ["Mark Thom <markjordanthom@gmail.com>"] authors = ["Mark Thom <markjordanthom@gmail.com>"]
repository = "https://github.com/mthom/rusty-wam" repository = "https://github.com/mthom/rusty-wam"
description = "The Warren Abstract Machine in Rust." description = "The Warren Abstract Machine in Rust."

4
src/prolog/heap_print.rs
View File

@@ -433,12 +433,12 @@ impl<'a, Formatter: HCValueFormatter, Outputter: HCValueOutputter>
}; };
match heap_val { match heap_val {
HeapCellValue::NamedStr(arity, name, Some(fixity)) => { HeapCellValue::NamedStr(arity, ref name, Some(fixity)) if name.as_str() != "," => {
if composite_brackets { if composite_brackets {
self.state_stack.push(TokenOrRedirect::Close); self.state_stack.push(TokenOrRedirect::Close);
} }
let ct = ClauseType::from(name, arity, Some(fixity)); let ct = ClauseType::from(name.clone(), arity, Some(fixity));
self.formatter.format_clause(iter, arity, ct, &mut self.state_stack); self.formatter.format_clause(iter, arity, ct, &mut self.state_stack);
if composite_brackets { if composite_brackets {

2
src/tests.rs
View File

@@ -1669,6 +1669,8 @@ fn test_queries_on_builtins()
[["X = (-)-(-)"]]); [["X = (-)-(-)"]]);
assert_prolog_success!(&mut wam, "?- X = ((:-):-(:-)).", assert_prolog_success!(&mut wam, "?- X = ((:-):-(:-)).",
[["X = (:-):-(:-)"]]); [["X = (:-):-(:-)"]]);
assert_prolog_success!(&mut wam, "?- X = (a:-b,c).",
[["X = a:-b,c"]]);
} }
#[test] #[test]