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

fix attempted bind to bound StackVar (#3089)

Browse Source
This commit is contained in:
Mark Thom
2025-09-17 19:43:37 -07:00
parent 012e3de3a1
commit ba7b54e8f8
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/machine/dispatch.rs
View File

@@ -2802,6 +2802,28 @@ impl Machine {
let mut h = 0; let mut h = 0;
let mut string_cursor = string.as_str(); let mut string_cursor = string.as_str();
if self.machine_st.heap[0].is_stack_var() {
let cell = self
.machine_st
.store(self.machine_st.deref(self.machine_st.heap[0]));
if let Some(r) = cell.as_var() {
let target_cell = backtrack_on_resource_error!(
self.machine_st,
self.machine_st.heap.allocate_pstr(string_cursor)
);
self.machine_st.bind(r, target_cell);
self.machine_st.mode = MachineMode::Write;
debug_assert!(!self.machine_st.fail);
continue;
}
self.machine_st.heap[0] = cell;
}
while let Some(c) = string_cursor.chars().next() { while let Some(c) = string_cursor.chars().next() {
read_heap_cell!(self.machine_st.heap[h], read_heap_cell!(self.machine_st.heap[h],
(HeapCellValueTag::PStrLoc, pstr_loc) => { (HeapCellValueTag::PStrLoc, pstr_loc) => {
@@ -2911,22 +2933,6 @@ impl Machine {
h = v; h = v;
} }
} }
(HeapCellValueTag::StackVar, s) => {
debug_assert_eq!(h, 0);
let target_cell = backtrack_on_resource_error!(
self.machine_st,
self.machine_st.heap.allocate_pstr(string_cursor)
);
self.machine_st.bind(
Ref::stack_cell(s),
target_cell,
);
self.machine_st.mode = MachineMode::Write;
break;
}
_ => { _ => {
self.machine_st.fail = true; self.machine_st.fail = true;
break; break;

4
src/types.rs
View File

@@ -125,9 +125,9 @@ pub(crate) enum RefTag {
pub struct Ref { pub struct Ref {
val: B56, val: B56,
#[allow(unused)] #[allow(unused)]
m: bool,
#[allow(unused)]
f: bool, f: bool,
#[allow(unused)]
m: bool,
tag: RefTag, tag: RefTag,
} }