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

restore .scryerrc loading

Browse Source
This commit is contained in:
Mark Thom
2021-02-28 11:03:55 -07:00
parent a367812348
commit f935060b2b
4 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/machine/mod.rs
View File

@@ -126,34 +126,6 @@ fn current_dir() -> PathBuf {
include!(concat!(env!("OUT_DIR"), "/libraries.rs"));
impl Machine {
/*
fn compile_scryerrc(&mut self) {
let mut path = match dirs_next::home_dir() {
Some(path) => path,
None => return,
};
path.push(".scryerrc");
if path.is_file() {
let file_src = match File::open(&path) {
Ok(file_handle) => Stream::from_file_as_input(
clause_name!(".scryerrc"),
file_handle,
),
Err(_) => return,
};
let rc_src = ListingSource::from_file_and_path(
clause_name!(".scryerrc"),
path.to_path_buf(),
);
compile_user_module(self, file_src, rc_src);
}
}
*/
fn run_module_predicate(&mut self, module_name: ClauseName, key: PredicateKey) {
if let Some(module) = self.indices.modules.get(&module_name) {
if let Some(ref code_index) = module.code_dir.get(&key) {

22
src/machine/system_calls.rs
View File

@@ -5454,6 +5454,28 @@ impl MachineState {
&SystemClauseType::SetNSTOAsUnify => {
self.unify_fn = MachineState::unify;
}
&SystemClauseType::HomeDirectory => {
let path = match dirs_next::home_dir() {
Some(path) => path,
None => {
self.fail = true;
return Ok(());
}
};
if path.is_dir() {
if let Some(path) = path.to_str() {
let path_atom = self.heap.to_unifiable(
HeapCellValue::Atom(clause_name!(path.to_string(), self.atom_tbl), None),
);
(self.unify_fn)(self, self[temp_v!(1)], path_atom);
return return_from_clause!(self.last_call, self);
}
}
self.fail = true;
}
};
return_from_clause!(self.last_call, self)