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

make self.s_offset use bytes in case of HeapPtr::PStr in UnifyVoid (#2897)

Browse Source
This commit is contained in:
Mark Thom
2025-04-21 20:25:50 -07:00
committed by Mark Thom
parent 41b90c6e46
commit 39ea2d5899
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/machine/dispatch.rs
View File

@@ -3072,9 +3072,19 @@ impl Machine {
} }
&Instruction::UnifyVoid(n) => { &Instruction::UnifyVoid(n) => {
match self.machine_st.mode { match self.machine_st.mode {
MachineMode::Read => { MachineMode::Read => match &self.machine_st.s {
self.machine_st.s_offset += n; HeapPtr::HeapCell(_) => self.machine_st.s_offset += n,
&HeapPtr::PStr(pstr_loc) => {
debug_assert!(n <= 2);
let mut char_iter = self.machine_st.heap.char_iter(pstr_loc);
// this only matters in the case that n == 1, but the case
// analysis isn't worth doing since the effect is benign if n ==
// 2
self.machine_st.s_offset +=
char_iter.next().unwrap().len_utf8();
} }
},
MachineMode::Write => { MachineMode::Write => {
let h = self.machine_st.heap.cell_len(); let h = self.machine_st.heap.cell_len();