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

support loading of modules from files specified at the command line

Browse Source
This commit is contained in:
Mark Thom
2019-09-29 10:16:27 -06:00
parent e8bac464d0
commit 376b39a4ef
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/prolog/machine/compile.rs
View File

@@ -81,6 +81,7 @@ fn load_module<R: Read>(wam: &mut Machine, name: &str, stream: ParsingStream<R>)
} }
} }
pub(super)
fn load_module_from_file(wam: &mut Machine, filename: &str) -> Result<ClauseName, SessionError> fn load_module_from_file(wam: &mut Machine, filename: &str) -> Result<ClauseName, SessionError>
{ {
let path = fix_filename(wam.indices.atom_tbl.clone(), filename)?; let path = fix_filename(wam.indices.atom_tbl.clone(), filename)?;

7
src/prolog/machine/mod.rs
View File

@@ -217,6 +217,13 @@ impl Machine {
} }
pub fn run_toplevel(&mut self) { pub fn run_toplevel(&mut self) {
use std::env;
use prolog::machine::compile::load_module_from_file;
for filename in env::args() {
load_module_from_file(self, &filename);
}
self.machine_st.p = CodePtr::Local(LocalCodePtr::DirEntry(self.toplevel_idx)); self.machine_st.p = CodePtr::Local(LocalCodePtr::DirEntry(self.toplevel_idx));
self.run_query(&AllocVarDict::new()); self.run_query(&AllocVarDict::new());
} }