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

speed up unification

Browse Source
This commit is contained in:
Mark Thom
2019-04-27 23:39:19 -06:00
parent 9b21e04539
commit e135063325
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "scryer-prolog" name = "scryer-prolog"
version = "0.8.69" version = "0.8.70"
authors = ["Mark Thom <markjordanthom@gmail.com>"] authors = ["Mark Thom <markjordanthom@gmail.com>"]
repository = "https://github.com/mthom/scryer-prolog" repository = "https://github.com/mthom/scryer-prolog"
description = "A modern Prolog implementation written mostly in Rust." description = "A modern Prolog implementation written mostly in Rust."

9
src/prolog/heap_print.rs
View File

@@ -487,7 +487,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
for _ in 0 .. arity { for _ in 0 .. arity {
self.state_stack.push(TokenOrRedirect::FunctorRedirect); self.state_stack.push(TokenOrRedirect::FunctorRedirect);
self.state_stack.push(TokenOrRedirect::Comma); self.state_stack.push(TokenOrRedirect::Comma);
} }
self.state_stack.pop(); self.state_stack.pop();
self.state_stack.push(TokenOrRedirect::Open); self.state_stack.push(TokenOrRedirect::Open);
@@ -778,7 +778,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
fn print_string(&mut self, s: StringList) { fn print_string(&mut self, s: StringList) {
match self.machine_st.machine_flags().double_quotes { match self.machine_st.machine_flags().double_quotes {
DoubleQuotes::Chars | DoubleQuotes::Codes => { DoubleQuotes::Chars | DoubleQuotes::Codes =>
if !s.is_empty() { if !s.is_empty() {
if self.ignore_ops { if self.ignore_ops {
self.format_struct(2, clause_name!(".")); self.format_struct(2, clause_name!("."));
@@ -791,8 +791,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
} }
} else if !self.at_cdr("") { } else if !self.at_cdr("") {
self.append_str("[]"); self.append_str("[]");
} },
},
DoubleQuotes::Atom => { DoubleQuotes::Atom => {
let borrowed_str = s.borrow(); let borrowed_str = s.borrow();
@@ -802,7 +801,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
} }
} }
} }
fn push_list(&mut self) { fn push_list(&mut self) {
let cell = Rc::new(Cell::new(true)); let cell = Rc::new(Cell::new(true));

14
src/prolog/machine/machine_state_impl.rs
View File

@@ -342,7 +342,8 @@ impl MachineState {
pub(super) fn unify(&mut self, a1: Addr, a2: Addr) { pub(super) fn unify(&mut self, a1: Addr, a2: Addr) {
let mut pdl = vec![a1, a2]; let mut pdl = vec![a1, a2];
let mut tabu_list: HashSet<(Addr, Addr)> = HashSet::new();
self.fail = false; self.fail = false;
while !(pdl.is_empty() || self.fail) { while !(pdl.is_empty() || self.fail) {
@@ -350,7 +351,16 @@ impl MachineState {
let d2 = self.deref(pdl.pop().unwrap()); let d2 = self.deref(pdl.pop().unwrap());
if d1 != d2 { if d1 != d2 {
match (self.store(d1.clone()), self.store(d2.clone())) { let d1 = self.store(d1);
let d2 = self.store(d2);
if tabu_list.contains(&(d1.clone(), d2.clone())) {
continue;
} else {
tabu_list.insert((d1.clone(), d2.clone()));
}
match (d1.clone(), d2.clone()) {
(Addr::AttrVar(h), addr) | (addr, Addr::AttrVar(h)) => (Addr::AttrVar(h), addr) | (addr, Addr::AttrVar(h)) =>
self.bind(Ref::AttrVar(h), addr), self.bind(Ref::AttrVar(h), addr),
(Addr::HeapCell(h), _) => (Addr::HeapCell(h), _) =>