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

call project_attributes from top-level (#846)

Browse Source
This commit is contained in:
Mark Thom
2021-03-04 16:05:01 -07:00
parent 34c3035c2b
commit 1b9db035ba
5 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/attributed_variables.rs
View File

@@ -17,11 +17,10 @@ pub(super) struct AttrVarInitializer {
pub(super) cp: LocalCodePtr,
pub(super) instigating_p: LocalCodePtr,
pub(super) verify_attrs_loc: usize,
pub(super) project_attrs_loc: usize,
}
impl AttrVarInitializer {
pub(super) fn new(verify_attrs_loc: usize, project_attrs_loc: usize) -> Self {
pub(super) fn new(verify_attrs_loc: usize) -> Self {
AttrVarInitializer {
attribute_goals: vec![],
attr_var_queue: vec![],
@@ -29,7 +28,6 @@ impl AttrVarInitializer {
instigating_p: LocalCodePtr::default(),
cp: LocalCodePtr::default(),
verify_attrs_loc,
project_attrs_loc,
}
}

2
src/machine/machine_state_impl.rs
View File

@@ -38,7 +38,7 @@ impl MachineState {
e: 0,
num_of_args: 0,
cp: LocalCodePtr::default(),
attr_var_init: AttrVarInitializer::new(0, 0),
attr_var_init: AttrVarInitializer::new(0),
fail: false,
heap: Heap::new(),
mode: MachineMode::Write,

6
src/machine/mod.rs
View File

@@ -200,12 +200,6 @@ impl Machine {
self.machine_st.attr_var_init.verify_attrs_loc = code_index.local().unwrap();
}
}
if let Some(module) = self.indices.modules.get(&clause_name!("$project_atts")) {
if let Some(code_index) = module.code_dir.get(&(clause_name!("driver"), 2)) {
self.machine_st.attr_var_init.project_attrs_loc = code_index.local().unwrap();
}
}
}
pub fn run_top_level(&mut self) {

6
src/machine/project_attributes.pl
View File

@@ -1,11 +1,9 @@
:- module('$project_atts', [copy_term/3]).
driver(QueryVars, AttrVars) :-
project_attributes(QueryVars, AttrVars) :-
gather_attr_modules(AttrVars, Modules0),
sort(Modules0, Modules),
call_project_attributes(Modules, QueryVars, AttrVars),
call_attribute_goals(Modules, '$project_atts':call_query_var_goals, QueryVars),
call_attribute_goals(Modules, '$project_atts':call_attr_var_goals, AttrVars).
call_project_attributes(Modules, QueryVars, AttrVars).
enqueue_goals(Goals0) :-
nonvar(Goals0),