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

fix root reading of complete strings (#2882)

Browse Source
This commit is contained in:
Mark Thom
2025-04-12 17:32:11 -07:00
committed by Mark Thom
parent 46f259bf7d
commit 907e64e185
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/read.rs
View File

@@ -345,7 +345,7 @@ impl<'a> TermWriter<'a> {
fn push_cell(&mut self, cell: HeapCellValue) -> Result<(), CompilationError> { fn push_cell(&mut self, cell: HeapCellValue) -> Result<(), CompilationError> {
self.heap self.heap
.push_cell(cell) .push_cell(cell)
.map_err(|h| CompilationError::FiniteMemoryInHeap(h)) .map_err(CompilationError::FiniteMemoryInHeap)
} }
fn term_as_addr(&mut self, term: &TermRef, h: usize) -> HeapCellValue { fn term_as_addr(&mut self, term: &TermRef, h: usize) -> HeapCellValue {
@@ -435,16 +435,22 @@ impl<'a> TermWriter<'a> {
continue; continue;
} }
TermRef::CompleteString(lvl, _, src) => { TermRef::CompleteString(lvl, _, src) => {
if let Level::Root = lvl {
self.push_stub_addr()?;
}
let cell = self let cell = self
.heap .heap
.allocate_cstr(src) .allocate_cstr(src)
.map_err(CompilationError::FiniteMemoryInHeap)?; .map_err(CompilationError::FiniteMemoryInHeap)?;
let h = self.heap.cell_len(); let new_h = self.heap.cell_len();
self.push_cell(cell)?; self.push_cell(cell)?;
if !matches!(lvl, Level::Root) { if !matches!(lvl, Level::Root) {
self.modify_head_of_queue(&term, h); self.modify_head_of_queue(&term, new_h);
} else {
self.heap[h] = cell;
} }
continue; continue;
@@ -462,7 +468,7 @@ impl<'a> TermWriter<'a> {
let tail_h = self.heap.cell_len(); let tail_h = self.heap.cell_len();
self.push_stub_addr()?; self.push_stub_addr()?;
if let Level::Root = lvl { if matches!(lvl, Level::Root) {
self.heap[h] = cell; self.heap[h] = cell;
} else { } else {
self.push_cell(cell)?; self.push_cell(cell)?;