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

do not add expansions behind module boundaries until the modules are added

Browse Source
This commit is contained in:
Mark Thom
2019-01-03 19:43:50 -07:00
parent 2f2f6314d8
commit 36fdc8e822
6 changed files with 320 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/prolog/toplevel.rs
View File

@@ -71,7 +71,7 @@ impl<'a, 'b> CompositeIndices<'a, 'b>
}
#[inline]
fn get_compile_time_hook(name: &str, arity: usize) -> Option<CompileTimeHook> {
fn as_compile_time_hook(name: &str, arity: usize) -> Option<CompileTimeHook> {
match (name, arity) {
("term_expansion", 2) => Some(CompileTimeHook::TermExpansion),
("goal_expansion", 2) => Some(CompileTimeHook::GoalExpansion),
@@ -84,12 +84,12 @@ fn is_compile_time_hook(name: &ClauseName, terms: &Vec<Box<Term>>) -> Option<Com
if name.as_str() == ":-" {
if let Some(ref term) = terms.first() {
if let &Term::Clause(_, ref name, ref terms, None) = term.as_ref() {
return get_compile_time_hook(name.as_str(), terms.len());
return as_compile_time_hook(name.as_str(), terms.len());
}
}
}
get_compile_time_hook(name.as_str(), terms.len())
as_compile_time_hook(name.as_str(), terms.len())
}
type CompileTimeHookCompileInfo = (CompileTimeHook, PredicateClause, VecDeque<TopLevel>);