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

metacall always hashes in user (re: issue #27)

Browse Source
This commit is contained in:
Mark Thom
2018-04-18 19:32:58 -06:00
parent 989d44d702
commit 09bd087ba5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,8 @@ impl<'a> CodeDirs<'a> {
{ {
match in_mod.as_str() { match in_mod.as_str() {
"user" | "builtin" => self.code_dir.get(&(name, arity)).cloned(), "user" | "builtin" => self.code_dir.get(&(name, arity)).cloned(),
_ => match self.modules.get(&in_mod) { _ =>
match self.modules.get(&in_mod) {
Some(&Module { ref code_dir, .. }) => Some(&Module { ref code_dir, .. }) =>
code_dir.get(&(name, arity)).cloned().map(CodeIndex::from), code_dir.get(&(name, arity)).cloned().map(CodeIndex::from),
None => None None => None
@@ -426,8 +427,7 @@ pub(crate) trait CallPolicy: Any {
}, },
&ClauseType::CallN => &ClauseType::CallN =>
if let Some((name, arity)) = machine_st.setup_call_n(arity) { if let Some((name, arity)) = machine_st.setup_call_n(arity) {
if let Some(idx) = code_dirs.get(name.clone(), arity, machine_st.p.module_name()) if let Some(idx) = code_dirs.get(name.clone(), arity, clause_name!("user")) {
{
self.context_call(machine_st, name, arity, idx, lco) self.context_call(machine_st, name, arity, idx, lco)
} else { } else {
Err(predicate_existence_error(name, arity, machine_st.heap.h)) Err(predicate_existence_error(name, arity, machine_st.heap.h))