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

style corrections

Browse Source
This commit is contained in:
Mark Thom
2024-12-25 12:11:17 -08:00
parent b7943837a0
commit d287095e61
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/machine/system_calls.rs
View File

@@ -107,15 +107,16 @@ use super::preprocessor::to_op_decl_spec;
#[derive(Debug)] #[derive(Debug)]
pub(crate) enum ModuleQuantification { pub(crate) enum ModuleQuantification {
Specified(HeapCellValue), Specified(HeapCellValue),
Unspecified Unspecified,
} }
impl ModuleQuantification { impl ModuleQuantification {
fn to_functor(&self) -> (Vec<HeapCellValue>, HeapCellValueTag) { fn to_functor(&self) -> (Vec<HeapCellValue>, HeapCellValueTag) {
match self { match self {
&ModuleQuantification::Specified(cell) => { &ModuleQuantification::Specified(cell) => (
(functor!(atom!("specified"), [cell(cell)]), HeapCellValueTag::Str) functor!(atom!("specified"), [cell(cell)]),
} HeapCellValueTag::Str,
),
ModuleQuantification::Unspecified => { ModuleQuantification::Unspecified => {
(functor!(atom!("unspecified")), HeapCellValueTag::Var) (functor!(atom!("unspecified")), HeapCellValueTag::Var)
} }
@@ -1362,9 +1363,8 @@ impl Machine {
}; };
let arity = arity - 1; let arity = arity - 1;
let (mut module_quantification, mut goal) = self let (mut module_quantification, mut goal) =
.machine_st self.machine_st.strip_module(self.machine_st.registers[1]);
.strip_module(self.machine_st.registers[1]);
let (mut name, mut goal_arity, index_cell_opt) = read_heap_cell!(goal, let (mut name, mut goal_arity, index_cell_opt) = read_heap_cell!(goal,
(HeapCellValueTag::Str, s) => { (HeapCellValueTag::Str, s) => {
@@ -1388,13 +1388,12 @@ impl Machine {
); );
let mut arity = arity + goal_arity; let mut arity = arity + goal_arity;
let mut module_name = self.quantification_to_module_name( let mut module_name = self
module_quantification, .quantification_to_module_name(module_quantification, self.machine_st.registers[1])
self.machine_st.registers[1], .map_err(|err| {
).map_err(|err| { let stub = functor_stub(atom!("call"), arity);
let stub = functor_stub(atom!("call"), arity); self.machine_st.error_form(err, stub)
self.machine_st.error_form(err, stub) })?;
})?;
let index_cell = if index_cell_opt.is_some() { let index_cell = if index_cell_opt.is_some() {
index_cell_opt index_cell_opt
@@ -1407,24 +1406,33 @@ impl Machine {
(module_quantification, goal) = self.machine_st.strip_module(goal); (module_quantification, goal) = self.machine_st.strip_module(goal);
if let Some((inner_name, inner_arity)) = self.machine_st.name_and_arity_from_heap(goal) { if let Some((inner_name, inner_arity)) =
module_name = self.quantification_to_module_name( self.machine_st.name_and_arity_from_heap(goal)
module_quantification, {
self.machine_st.registers[1], module_name = self
).unwrap_or(module_name); .quantification_to_module_name(
module_quantification,
self.machine_st.registers[1],
)
.unwrap_or(module_name);
arity -= goal_arity; arity -= goal_arity;
(name, goal_arity) = (inner_name, inner_arity); (name, goal_arity) = (inner_name, inner_arity);
arity += goal_arity; arity += goal_arity;
self.indices.get_predicate_code_index(name, arity, module_name) self.indices
.get_predicate_code_index(name, arity, module_name)
} else { } else {
None None
} }
} else if self.indices.goal_expansion_defined((name, arity), module_name) { } else if self
.indices
.goal_expansion_defined((name, arity), module_name)
{
None None
} else { } else {
self.indices.get_predicate_code_index(name, arity, module_name) self.indices
.get_predicate_code_index(name, arity, module_name)
} }
}; };
@@ -1449,7 +1457,8 @@ impl Machine {
// complete_partial_goal prior to goal_expansion. // complete_partial_goal prior to goal_expansion.
let mut supp_vars = IndexSet::with_hasher(FxBuildHasher::default()); let mut supp_vars = IndexSet::with_hasher(FxBuildHasher::default());
self.machine_st.variable_set(&mut supp_vars, self.machine_st.registers[2]); self.machine_st
.variable_set(&mut supp_vars, self.machine_st.registers[2]);
struct GoalAnalysisResult { struct GoalAnalysisResult {
is_simple_goal: bool, is_simple_goal: bool,
@@ -1576,7 +1585,8 @@ impl Machine {
result.goal result.goal
} else { } else {
let mut unexpanded_vars = IndexSet::with_hasher(FxBuildHasher::default()); let mut unexpanded_vars = IndexSet::with_hasher(FxBuildHasher::default());
self.machine_st.variable_set(&mut unexpanded_vars, self.machine_st.registers[5]); self.machine_st
.variable_set(&mut unexpanded_vars, self.machine_st.registers[5]);
// all supp_vars must appear later! // all supp_vars must appear later!
let vars = IndexSet::<HeapCellValue, BuildHasherDefault<FxHasher>>::from_iter( let vars = IndexSet::<HeapCellValue, BuildHasherDefault<FxHasher>>::from_iter(
@@ -1632,9 +1642,8 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn is_expanded_or_inlined(&self) -> bool { pub(crate) fn is_expanded_or_inlined(&self) -> bool {
let (_quantification, qualified_goal) = self let (_quantification, qualified_goal) =
.machine_st self.machine_st.strip_module(self.machine_st.registers[1]);
.strip_module(self.machine_st.registers[1]);
if HeapCellValueTag::Str == qualified_goal.get_tag() { if HeapCellValueTag::Str == qualified_goal.get_tag() {
let s = qualified_goal.get_value() as usize; let s = qualified_goal.get_value() as usize;
@@ -1664,9 +1673,8 @@ impl Machine {
#[inline(always)] #[inline(always)]
pub(crate) fn strip_module(&mut self) { pub(crate) fn strip_module(&mut self) {
let (module_quantification, qualified_goal) = self let (module_quantification, qualified_goal) =
.machine_st self.machine_st.strip_module(self.machine_st.registers[1]);
.strip_module(self.machine_st.registers[1]);
let target_module_loc = self.machine_st.registers[2]; let target_module_loc = self.machine_st.registers[2];
@@ -5254,9 +5262,7 @@ impl Machine {
// at the end of the list, no match found in this case. // at the end of the list, no match found in this case.
self.machine_st.fail = true; self.machine_st.fail = true;
} else { } else {
let (_, qualified_goal) = self let (_, qualified_goal) = self.machine_st.strip_module(list_head);
.machine_st
.strip_module(list_head);
unify!(self.machine_st, qualified_goal, attr); unify!(self.machine_st, qualified_goal, attr);
} }