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

Encapsulate accesses to IndexStore::streams and ::stream_aliases

Browse Source 
These two fields are able to hold `Stream` instances, which predicates like `close/1`
expect to be managed properly for their correctness. To ensure that this is the case,
I have removed direct accesses to those two fields, so that they can be properly managed
in one place.
This commit is contained in:
Emilie Burgun
2025-02-03 14:00:37 +01:00
parent 2fe7b55343
commit 0cf46d3ec4
5 changed files with 187 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/streams.rs
View File

@@ -1594,7 +1594,7 @@ impl MachineState {
pub(crate) fn get_stream_or_alias(
&mut self,
addr: HeapCellValue,
stream_aliases: &StreamAliasDir,
indices: &IndexStore,
caller: Atom,
arity: usize,
) -> Result<Stream, MachineStub> {
@@ -1604,8 +1604,8 @@ impl MachineState {
(HeapCellValueTag::Atom, (name, arity)) => {
debug_assert_eq!(arity, 0);
return match stream_aliases.get(&name) {
Some(stream) if !stream.is_null_stream() => Ok(*stream),
return match indices.get_stream(name) {
Some(stream) if !stream.is_null_stream() => Ok(stream),
_ => {
let stub = functor_stub(caller, arity);
let addr = atom_as_cell!(name);
@@ -1622,8 +1622,8 @@ impl MachineState {
debug_assert_eq!(arity, 0);
return match stream_aliases.get(&name) {
Some(stream) if !stream.is_null_stream() => Ok(*stream),
return match indices.get_stream(name) {
Some(stream) if !stream.is_null_stream() => Ok(stream),
_ => {
let stub = functor_stub(caller, arity);
let addr = atom_as_cell!(name);
@@ -1813,7 +1813,7 @@ impl MachineState {
// 8.11.5.3l)
if let Some(alias) = options.get_alias() {
if indices.stream_aliases.contains_key(&alias) {
if indices.has_stream(alias) {
return Err(self.occupied_alias_permission_error(alias, atom!("open"), 4));
}
}