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

fix match_partial_string, compare_pstr_to_string (#1451)

Browse Source
This commit is contained in:
Mark Thom
2022-04-30 19:51:19 -06:00
parent 72536037ca
commit 789f662ec8
3 changed files with 94 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/machine/machine_state_impl.rs
View File

@@ -1863,7 +1863,9 @@ impl MachineState {
let h = self.heap.len();
self.heap.push(value);
let prefix_len;
let mut heap_pstr_iter = HeapPStrIter::new(&self.heap, h);
let s = string.as_str();
match heap_pstr_iter.compare_pstr_to_string(s) {
@@ -1911,37 +1913,65 @@ impl MachineState {
}
}
);
return;
}
Some(PStrPrefixCmpResult { prefix_len, .. }) => {
let focus = heap_pstr_iter.focus();
let tail_addr = self.heap[focus];
let h = self.heap.len();
let target_cell = if has_tail {
self.s = HeapPtr::HeapCell(h + 1);
self.s_offset = 0;
self.mode = MachineMode::Read;
put_partial_string(
&mut self.heap,
&string.as_str()[prefix_len ..],
&mut self.atom_tbl,
)
} else {
put_complete_string(
&mut self.heap,
&string.as_str()[prefix_len ..],
&mut self.atom_tbl,
)
};
unify!(self, tail_addr, target_cell);
Some(PStrPrefixCmpResult { prefix_len: inner_prefix_len, .. }) => {
prefix_len = inner_prefix_len;
}
None => {
self.fail = true;
read_heap_cell!(value,
(HeapCellValueTag::Str, s) => {
let cell = heap_loc_as_cell!(s + 1);
let is_list = self.heap[s] == atom_as_cell!(atom!("."), 2);
if !(is_list && self.store(self.deref(cell)).is_var()) {
self.fail = true;
return;
}
}
(HeapCellValueTag::Lis, l) => {
let cell = heap_loc_as_cell!(l);
if !self.store(self.deref(cell)).is_var() {
self.fail = true;
return;
}
}
(HeapCellValueTag::AttrVar |
HeapCellValueTag::StackVar |
HeapCellValueTag::Var) => {
}
_ => {
self.fail = true;
return;
}
);
prefix_len = 0;
}
}
let focus = heap_pstr_iter.focus();
let tail_addr = self.heap[focus];
let target_cell = self.push_str_to_heap(&string.as_str()[prefix_len..], has_tail);
unify!(self, tail_addr, target_cell);
}
#[inline(always)]
pub(super) fn push_str_to_heap(&mut self, pstr: &str, has_tail: bool) -> HeapCellValue {
let h = self.heap.len();
if has_tail {
self.s = HeapPtr::HeapCell(h + 1);
self.s_offset = 0;
self.mode = MachineMode::Read;
put_partial_string(&mut self.heap, pstr, &mut self.atom_tbl)
} else {
put_complete_string(&mut self.heap, pstr, &mut self.atom_tbl)
}
}
pub(super) fn write_literal_to_var(&mut self, deref_v: HeapCellValue, lit: HeapCellValue) {
@@ -1979,9 +2009,9 @@ impl MachineState {
}
(HeapCellValueTag::CStr, cstr_atom) => {
read_heap_cell!(store_v,
(HeapCellValueTag::PStrLoc
| HeapCellValueTag::Lis
| HeapCellValueTag::Str) => {
(HeapCellValueTag::PStrLoc |
HeapCellValueTag::Lis |
HeapCellValueTag::Str) => {
self.match_partial_string(store_v, cstr_atom, false);
}
(HeapCellValueTag::AttrVar | HeapCellValueTag::Var) => {