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

improve matching on partial strings as lists

Browse Source
This commit is contained in:
Mark Thom
2019-04-30 21:30:28 -06:00
parent d09aeb4125
commit b05cff3044
4 changed files with 15 additions and 9 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.77" version = "0.8.78"
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/indexing.rs
View File

@@ -58,8 +58,13 @@ impl CodeOffsets {
let is_initial_index = self.lists.is_empty(); let is_initial_index = self.lists.is_empty();
self.lists.push(Self::add_index(is_initial_index, index)); self.lists.push(Self::add_index(is_initial_index, index));
}, },
&Term::Constant(_, Constant::String(_)) &Term::Constant(_, Constant::String(ref s))
if !self.flags.double_quotes.is_atom() => { // strings are lists in this case. if !self.flags.double_quotes.is_atom() && !s.is_empty() => { // strings are lists in this case.
let is_initial_index = self.lists.is_empty();
self.lists.push(Self::add_index(is_initial_index, index));
},
&Term::Constant(_, Constant::String(ref s))
if !self.flags.double_quotes.is_atom() && s.is_expandable() => {
let is_initial_index = self.lists.is_empty(); let is_initial_index = self.lists.is_empty();
self.lists.push(Self::add_index(is_initial_index, index)); self.lists.push(Self::add_index(is_initial_index, index));
}, },

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

@@ -1496,7 +1496,8 @@ impl MachineState {
let offset = match addr { let offset = match addr {
Addr::HeapCell(_) | Addr::StackCell(..) | Addr::AttrVar(..) => v, Addr::HeapCell(_) | Addr::StackCell(..) | Addr::AttrVar(..) => v,
Addr::Con(Constant::String(_)) if !self.flags.double_quotes.is_atom() => l, Addr::Con(Constant::String(ref s)) if !self.flags.double_quotes.is_atom() =>
if s.is_empty() && !s.is_expandable() { c } else { l },
Addr::Con(_) => c, Addr::Con(_) => c,
Addr::Lis(_) => l, Addr::Lis(_) => l,
Addr::Str(_) => s, Addr::Str(_) => s,