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

merge if let, match structures

Browse Source 
Signed-off-by: Thierry Marianne <thierry@marianne.io>
This commit is contained in:
Thierry Marianne
2025-09-14 18:32:30 +02:00
parent 1ece558a71
commit 28ec457159
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/machine/machine_state.rs
View File

@@ -745,44 +745,29 @@ impl MachineState {
stream: Stream, stream: Stream,
indices: &mut IndexStore, indices: &mut IndexStore,
) -> CallResult { ) -> CallResult {
if let Stream::Readline(ptr) = stream {
let readline = unsafe { ptr.as_ptr().as_mut() }.unwrap();
readline.set_atoms_for_completion(&self.atom_tbl);
return self.read_term(
stream,
indices,
MachineState::read_term_from_user_input_eof_handler,
);
}
match stream { match stream {
#[cfg(feature = "http")] #[cfg(feature = "http")]
Stream::HttpRead(_) => { Stream::HttpRead(_) => self.read_term(
return self.read_term( stream,
indices,
MachineState::read_term_from_user_input_eof_handler,
),
Stream::Readline(ptr) => {
let readline = unsafe { ptr.as_ptr().as_mut() }.unwrap();
readline.set_atoms_for_completion(&self.atom_tbl);
self.read_term(
stream, stream,
indices, indices,
MachineState::read_term_from_user_input_eof_handler, MachineState::read_term_from_user_input_eof_handler,
) )
} }
Stream::InputFile(_) | Stream::NamedTcp(_) => { Stream::Byte(_) | Stream::InputFile(_) | Stream::NamedTcp(_) => self.read_term(
return self.read_term(
stream, stream,
indices, indices,
MachineState::read_term_from_user_input_eof_handler, MachineState::read_term_from_user_input_eof_handler,
) ),
_ => Err(functor_stub(atom!("read_term_from_user_input"), 3)),
} }
_ => true,
};
if let Stream::Byte(_) = stream {
return self.read_term(
stream,
indices,
MachineState::read_term_from_user_input_eof_handler,
);
}
unreachable!("Stream must be a Stream::Readline(_)")
} }
pub fn read_term_eof_handler(&mut self, mut stream: Stream) -> Result<OnEOF, MachineStub> { pub fn read_term_eof_handler(&mut self, mut stream: Stream) -> Result<OnEOF, MachineStub> {