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

fix backtrack_on_resource_error around choice instructions

Browse Source
This commit is contained in:
Mark Thom
2025-12-03 18:13:00 -08:00
parent 96a9dfcc1b
commit f570e566f8
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/machine/dispatch.rs
View File

@@ -1787,7 +1787,8 @@ impl Machine {
self.machine_st.num_of_args += 1; self.machine_st.num_of_args += 1;
backtrack_on_resource_error!( backtrack_on_resource_error!(
self.machine_st, self.machine_st,
self.try_me_else(next_i) self.try_me_else(next_i),
continue
); );
self.machine_st.num_of_args -= 1; self.machine_st.num_of_args -= 1;
} }
@@ -1869,7 +1870,8 @@ impl Machine {
self.machine_st.num_of_args += 1; self.machine_st.num_of_args += 1;
backtrack_on_resource_error!( backtrack_on_resource_error!(
self.machine_st, self.machine_st,
self.try_me_else(next_i) self.try_me_else(next_i),
continue
); );
self.machine_st.num_of_args -= 1; self.machine_st.num_of_args -= 1;
} }
@@ -1923,7 +1925,11 @@ impl Machine {
} }
} }
&Instruction::TryMeElse(offset) => { &Instruction::TryMeElse(offset) => {
backtrack_on_resource_error!(self.machine_st, self.try_me_else(offset)); backtrack_on_resource_error!(
self.machine_st,
self.try_me_else(offset),
continue
);
} }
&Instruction::DefaultRetryMeElse(offset) => { &Instruction::DefaultRetryMeElse(offset) => {
self.retry_me_else(offset); self.retry_me_else(offset);
@@ -1976,7 +1982,8 @@ impl Machine {
&Instruction::Allocate(num_cells) => { &Instruction::Allocate(num_cells) => {
backtrack_on_resource_error!( backtrack_on_resource_error!(
self.machine_st, self.machine_st,
self.machine_st.allocate(num_cells) self.machine_st.allocate(num_cells),
continue
); );
} }
&Instruction::DefaultCallAcyclicTerm => { &Instruction::DefaultCallAcyclicTerm => {
@@ -3686,7 +3693,8 @@ impl Machine {
IndexedChoiceInstruction::Try(offset) => { IndexedChoiceInstruction::Try(offset) => {
backtrack_on_resource_error!( backtrack_on_resource_error!(
self.machine_st, self.machine_st,
self.indexed_try(offset) self.indexed_try(offset),
continue
); );
} }
IndexedChoiceInstruction::Retry(l) => { IndexedChoiceInstruction::Retry(l) => {
@@ -3742,7 +3750,8 @@ impl Machine {
self.machine_st.num_of_args += 1; self.machine_st.num_of_args += 1;
backtrack_on_resource_error!( backtrack_on_resource_error!(
self.machine_st, self.machine_st,
self.indexed_try(offset) self.indexed_try(offset),
continue
); );
self.machine_st.num_of_args -= 1; self.machine_st.num_of_args -= 1;
} }