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

provide contextual information in the return value of try_in_situ_result

Browse Source
This commit is contained in:
Mark Thom
2020-03-19 20:41:58 -06:00
parent 487fe21e25
commit 057e2d8056
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/prolog/machine/machine_state.rs
View File

@@ -437,15 +437,15 @@ impl MachineState {
} }
} }
fn try_in_situ_lookup(name: ClauseName, arity: usize, indices: &IndexStore) -> Option<usize> fn try_in_situ_lookup(name: ClauseName, arity: usize, indices: &IndexStore) -> Option<LocalCodePtr>
{ {
match indices.in_situ_code_dir.get(&(name.clone(), arity)) { match indices.in_situ_code_dir.get(&(name.clone(), arity)) {
Some(p) => Some(*p), Some(p) => Some(LocalCodePtr::InSituDirEntry(*p)),
None => None =>
match indices.code_dir.get(&(name, arity)) { match indices.code_dir.get(&(name, arity)) {
Some(ref idx) => { Some(ref idx) => {
if let IndexPtr::Index(p) = idx.0.borrow().0 { if let IndexPtr::Index(p) = idx.0.borrow().0 {
Some(p) Some(LocalCodePtr::DirEntry(p))
} else { } else {
None None
} }
@@ -464,12 +464,12 @@ fn try_in_situ(
) -> CallResult { ) -> CallResult {
if let Some(p) = try_in_situ_lookup(name.clone(), arity, indices) { if let Some(p) = try_in_situ_lookup(name.clone(), arity, indices) {
if last_call { if last_call {
machine_st.execute_at_index(arity, LocalCodePtr::DirEntry(p)); machine_st.execute_at_index(arity, p);
} else { } else {
machine_st.call_at_index(arity, LocalCodePtr::DirEntry(p)); machine_st.call_at_index(arity, p);
} }
machine_st.p = in_situ_dir_entry!(p); machine_st.p = CodePtr::Local(p);
Ok(()) Ok(())
} else { } else {
let stub = MachineError::functor_stub(name.clone(), arity); let stub = MachineError::functor_stub(name.clone(), arity);
@@ -760,10 +760,10 @@ pub(crate) trait CallPolicy: Any {
machine_st.compare_term(qt); machine_st.compare_term(qt);
return_from_clause!(machine_st.last_call, machine_st) return_from_clause!(machine_st.last_call, machine_st)
} }
&BuiltInClauseType::Nl => { &BuiltInClauseType::Nl => {
write!(current_output_stream, "\n").unwrap(); write!(current_output_stream, "\n").unwrap();
current_output_stream.flush().unwrap(); current_output_stream.flush().unwrap();
return_from_clause!(machine_st.last_call, machine_st) return_from_clause!(machine_st.last_call, machine_st)
} }
&BuiltInClauseType::Read => { &BuiltInClauseType::Read => {
@@ -997,7 +997,7 @@ impl CallPolicy for CWILCallPolicy {
current_input_stream, current_input_stream,
current_output_stream current_output_stream
)?; )?;
self.increment(machine_st) self.increment(machine_st)
} }
@@ -1016,7 +1016,7 @@ impl CallPolicy for CWILCallPolicy {
current_input_stream, current_input_stream,
current_output_stream, current_output_stream,
)?; )?;
self.increment(machine_st) self.increment(machine_st)
} }
} }

6
src/prolog/macros.rs
View File

@@ -211,12 +211,6 @@ macro_rules! dir_entry {
}; };
} }
macro_rules! in_situ_dir_entry {
($idx:expr) => {
CodePtr::Local(LocalCodePtr::InSituDirEntry($idx))
};
}
macro_rules! set_code_index { macro_rules! set_code_index {
($idx:expr, $ip:expr, $mod_name:expr) => {{ ($idx:expr, $ip:expr, $mod_name:expr) => {{
let mut idx = $idx.0.borrow_mut(); let mut idx = $idx.0.borrow_mut();