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

reset instruction pointers with calls, make HCPrinter::range_from safe (#1233)

Browse Source
This commit is contained in:
Mark Thom
2022-01-31 21:24:19 -07:00
parent 4b71607215
commit 37e34c5209
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/heap_print.rs
View File

@@ -376,7 +376,7 @@ impl HCValueOutputter for PrinterOutputter {
}
fn range_from(&self, index: RangeFrom<usize>) -> &str {
&self.contents.as_str()[index]
&self.contents.as_str().get(index).unwrap_or("")
}
}

4
src/machine/dispatch.rs
View File

@@ -962,6 +962,8 @@ impl Machine {
match self.find_living_dynamic_else(p) {
Some((p, next_i)) => {
self.machine_st.p = p;
self.machine_st.oip = 0;
self.machine_st.iip = 0;
match self.machine_st.dynamic_mode {
FirstOrNext::First if next_i == 0 => {
@@ -1044,6 +1046,8 @@ impl Machine {
match self.find_living_dynamic_else(p) {
Some((p, next_i)) => {
self.machine_st.p = p;
self.machine_st.oip = 0;
self.machine_st.iip = 0;
match self.machine_st.dynamic_mode {
FirstOrNext::First if next_i == 0 => {

6
src/machine/machine_state.rs
View File

@@ -439,15 +439,19 @@ impl MachineState {
pub(super) fn call_at_index(&mut self, arity: usize, p: usize) {
self.cp = self.p + 1;
self.p = p;
self.oip = 0;
self.iip = 0;
self.num_of_args = arity;
self.b0 = self.b;
}
#[inline(always)]
pub(super) fn execute_at_index(&mut self, arity: usize, p: usize) {
self.p = p;
self.oip = 0;
self.iip = 0;
self.num_of_args = arity;
self.b0 = self.b;
self.p = p;
}
pub fn read_term(&mut self, stream: Stream, indices: &mut IndexStore) -> CallResult {