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

add read_term_from_chars/3 (#637)

Browse Source
This commit is contained in:
Mark
2023-07-15 11:20:20 -06:00
parent b234ef7ea3
commit 5a7da721cd
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/machine/dispatch.rs
View File

@@ -4270,6 +4270,14 @@ impl Machine {
self.quoted_token();
step_or_fail!(self, self.machine_st.p = self.machine_st.cp);
}
&Instruction::CallReadFromChars => {
try_or_throw!(self.machine_st, self.read_from_chars());
step_or_fail!(self, self.machine_st.p += 1);
}
&Instruction::ExecuteReadFromChars => {
try_or_throw!(self.machine_st, self.read_from_chars());
step_or_fail!(self, self.machine_st.p = self.machine_st.cp);
}
&Instruction::CallReadTermFromChars => {
try_or_throw!(self.machine_st, self.read_term_from_chars());
step_or_fail!(self, self.machine_st.p += 1);

12
src/machine/system_calls.rs
View File

@@ -5792,7 +5792,7 @@ impl Machine {
}
#[inline(always)]
pub(crate) fn read_term_from_chars(&mut self) -> CallResult {
pub(crate) fn read_from_chars(&mut self) -> CallResult {
if let Some(atom_or_string) = self.machine_st.value_to_str_like(self.machine_st.registers[1]) {
let chars = CharReader::new(ByteStream::from_string(atom_or_string.to_string()));
let mut parser = Parser::new(chars, &mut self.machine_st);
@@ -5829,6 +5829,16 @@ impl Machine {
Ok(())
}
#[inline(always)]
pub(crate) fn read_term_from_chars(&mut self) -> CallResult {
if let Some(atom_or_string) = self.machine_st.value_to_str_like(self.machine_st.registers[1]) {
let stream = Stream::from_owned_string(atom_or_string.to_string(), &mut self.machine_st.arena);
self.machine_st.read_term(stream, &mut self.indices)
} else {
unreachable!()
}
}
#[inline(always)]
pub(crate) fn reset_block(&mut self) {
let addr = self.deref_register(1);