improve matching on partial strings as lists

2019-04-30 21:30:28 -06:00
parent d09aeb4125
commit b05cff3044
4 changed files with 15 additions and 9 deletions
--- a/src/prolog/machine/machine_state_impl.rs
+++ b/src/prolog/machine/machine_state_impl.rs
@@ -1496,7 +1496,8 @@ impl MachineState {

                let offset = match addr {
                    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::Lis(_) => l,
                    Addr::Str(_) => s,