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

emit stream aliases as permission error culprits whenever possible

Browse Source
This commit is contained in:
Mark
2023-07-12 12:17:06 -06:00
parent 44052cb373
commit 3f5dbc1680
2 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/machine/machine_errors.rs
View File

@@ -1,3 +1,4 @@
use crate::arena::*;
use crate::atom_table::*;
use crate::parser::ast::*;
@@ -6,6 +7,7 @@ use crate::forms::*;
use crate::machine::heap::*;
use crate::machine::loader::CompilationTarget;
use crate::machine::machine_state::*;
use crate::machine::streams::*;
use crate::machine::system_calls::BrentAlgState;
use crate::types::*;
@@ -158,9 +160,29 @@ impl PermissionError for HeapCellValue {
index_atom: Atom,
perm: Permission,
) -> MachineError {
let cell = read_heap_cell!(self,
(HeapCellValueTag::Cons, ptr) => {
match_untyped_arena_ptr!(ptr,
(ArenaHeaderTag::Stream, stream) => {
if let Some(alias) = stream.options().get_alias() {
atom_as_cell!(alias)
} else {
self
}
}
_ => {
self
}
)
}
_ => {
self
}
);
let stub = functor!(
atom!("permission_error"),
[atom(perm.as_atom()), atom(index_atom), cell(self)]
[atom(perm.as_atom()), atom(index_atom), cell(cell)]
);
MachineError {

40
src/machine/streams.rs
View File

@@ -1491,21 +1491,21 @@ impl MachineState {
}
(HeapCellValueTag::Cons, ptr) => {
match_untyped_arena_ptr!(ptr,
(ArenaHeaderTag::Stream, stream) => {
return if stream.is_null_stream() {
Err(self.open_permission_error(stream_as_cell!(stream), caller, arity))
} else {
Ok(stream)
};
}
(ArenaHeaderTag::Dropped, _value) => {
let stub = functor_stub(caller, arity);
let err = self.existence_error(ExistenceError::Stream(addr));
(ArenaHeaderTag::Stream, stream) => {
return if stream.is_null_stream() {
Err(self.open_permission_error(stream_as_cell!(stream), caller, arity))
} else {
Ok(stream)
};
}
(ArenaHeaderTag::Dropped, _value) => {
let stub = functor_stub(caller, arity);
let err = self.existence_error(ExistenceError::Stream(addr));
return Err(self.error_form(err, stub));
}
_ => {
}
return Err(self.error_form(err, stub));
}
_ => {
}
);
}
_ => {
@@ -1547,7 +1547,15 @@ impl MachineState {
arity: usize,
) -> MachineStub {
let stub = functor_stub(caller, arity);
let err = self.permission_error(perm, err_atom, stream_as_cell!(stream));
let err = self.permission_error(
perm,
err_atom,
if let Some(alias) = stream.options().get_alias() {
atom_as_cell!(alias)
} else {
stream_as_cell!(stream)
},
);
self.error_form(err, stub)
}
@@ -1715,7 +1723,7 @@ impl MachineState {
}
ErrorKind::PermissionDenied => {
// 8.11.5.3k)
return Err(self.open_permission_error(self[temp_v!(1)], atom!("open"), 4));
return Err(self.open_permission_error(self.registers[1], atom!("open"), 4));
}
_ => {
let stub = functor_stub(atom!("open"), 4);