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

flush loader term queue before compiling declarations, declare '/1' as dynamic before asserting

Browse Source
This commit is contained in:
Mark Thom
2021-03-22 16:53:23 -06:00
parent 0cb731c584
commit fffb87d013
3 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/machine/system_calls.rs
View File

@@ -3471,14 +3471,23 @@ impl MachineState {
self.fail = match self.store(self.deref(self[temp_v!(2)])) {
Addr::Str(s) => match &self.heap[s] {
&HeapCellValue::NamedStr(arity, ref name, ref spec) => {
CLAUSE_TYPE_FORMS.borrow().get(&(name.as_str(), arity)).is_some() ||
indices.get_predicate_code_index(
name.clone(),
arity,
module_name,
spec.clone(),
)
.is_some()
if CLAUSE_TYPE_FORMS.borrow().get(&(name.as_str(), arity)).is_some() {
true
} else {
let index = indices.get_predicate_code_index(
name.clone(),
arity,
module_name,
spec.clone(),
)
.map(|index| index.get())
.unwrap_or(IndexPtr::DynamicUndefined);
match index {
IndexPtr::DynamicUndefined => false,
_ => true,
}
}
}
_ => {
unreachable!()
@@ -3489,9 +3498,23 @@ impl MachineState {
let spec =
fetch_atom_op_spec(name.clone(), spec.clone(), &indices.op_dir);
CLAUSE_TYPE_FORMS.borrow().get(&(name.as_str(), 0)).is_some() ||
indices.get_predicate_code_index(name.clone(), 0, module_name, spec)
.is_some()
if CLAUSE_TYPE_FORMS.borrow().get(&(name.as_str(), 0)).is_some() {
true
} else {
let index = indices.get_predicate_code_index(
name.clone(),
0,
module_name,
spec.clone(),
)
.map(|index| index.get())
.unwrap_or(IndexPtr::DynamicUndefined);
match index {
IndexPtr::DynamicUndefined => false,
_ => true,
}
}
} else {
unreachable!()
}