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

remove overengineered RecursionGuard

Browse Source
This commit is contained in:
Skgland
2025-12-08 22:27:24 +01:00
committed by Bennet Bleßmann
parent 616f071cd9
commit 00aba96185
1 changed files with 7 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/machine/machine_errors.rs
View File

@@ -778,47 +778,16 @@ impl MachineState {
// throw an error pre-allocated in the heap
pub(super) fn throw_resource_error(&mut self, err: AllocError) {
struct RecursionGuard<'state> {
machine_state: &'state mut MachineState,
if self.throwing_resource_error {
panic!("attempted to throw `error(resource_error(memory), [])` while attempting to throw `error(resource_error(memory), [])`");
}
self.throwing_resource_error = true;
impl<'state> RecursionGuard<'state> {
fn new(machine_state: &'state mut MachineState) -> Self {
if machine_state.throwing_resource_error {
panic!("attempted to throw `error(resource_error(memory), [])` while attempting to throw `error(resource_error(memory), [])`");
}
machine_state.throwing_resource_error = true;
Self { machine_state }
}
}
self.registers[1] = str_loc_as_cell!(err.resource_error_offset(&mut self.heap));
self.set_ball();
self.unwind_stack();
impl Drop for RecursionGuard<'_> {
fn drop(&mut self) {
self.machine_state.throwing_resource_error = false;
}
}
impl std::ops::Deref for RecursionGuard<'_> {
type Target = MachineState;
fn deref(&self) -> &MachineState {
self.machine_state
}
}
impl std::ops::DerefMut for RecursionGuard<'_> {
fn deref_mut(&mut self) -> &mut MachineState {
self.machine_state
}
}
let mut guard = RecursionGuard::new(self);
let state = &mut *guard;
state.registers[1] = str_loc_as_cell!(err.resource_error_offset(&mut state.heap));
state.set_ball();
state.unwind_stack();
self.throwing_resource_error = false;
}
pub(super) fn throw_exception(&mut self, err: MachineStub) {