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

fix additional tests (#2293)

Browse Source
This commit is contained in:
Mark
2024-01-12 22:01:01 -07:00
parent 60d34bea70
commit dde03718e1
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/machine/unify.rs
View File

@@ -229,39 +229,32 @@ pub(crate) trait Unifier: DerefMut<Target = MachineState> {
break 'outer;
}
}
(HeapCellValueTag::CStr, cstr) => {
let cstr_str = cstr.as_str();
let mut cstr_chars_iter = cstr_str.chars();
let mut char_len = 0;
(HeapCellValueTag::CStr | HeapCellValueTag::PStrLoc) => {
machine_st.pdl.push(focus);
while let Some(c) = chars_iter.next() {
if Some(c) != cstr_chars_iter.next() {
machine_st.fail = true;
break 'outer;
match chars_iter.item.unwrap() {
PStrIteratee::Char(focus, _) |
PStrIteratee::PStrSegment(focus, _, 0) => {
machine_st.pdl.push(machine_st.heap[focus]);
machine_st.heap.pop();
machine_st.heap.pop();
}
char_len += c.len_utf8();
}
let chars_iter_focus = chars_iter.iter.focus;
PStrIteratee::PStrSegment(focus, _, n) => {
let segment = machine_st.heap[focus];
machine_st.heap.pop();
machine_st.heap.pop();
let pstr_loc = if cstr_str.len() > char_len {
let h = machine_st.heap.len();
machine_st.heap.push(string_as_cstr_cell!(cstr));
machine_st.pdl.push(pstr_loc_as_cell!(h+1));
machine_st.heap.push(segment);
machine_st.heap.push(pstr_offset_as_cell!(h));
machine_st.heap.push(fixnum_as_cell!(Fixnum::build_with(char_len as i64)));
pstr_loc_as_cell!(h+1)
} else {
empty_list_as_cell!()
};
machine_st.pdl.push(chars_iter_focus);
machine_st.pdl.push(pstr_loc);
machine_st.heap.push(fixnum_as_cell!(Fixnum::build_with(n as i64)));
}
}
return;
}