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

Renamed find_optimal_index to first_instantiated_index

Browse Source
This commit is contained in:
notoria
2020-12-21 20:05:45 +01:00
parent 2889631b61
commit 706d842102
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/codegen.rs
View File

@@ -858,7 +858,8 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
Ok(code) Ok(code)
} }
fn find_optimal_index(clauses: &[PredicateClause]) -> usize { /// Returns the index of the first instantiated argument.
fn first_instantiated_index(clauses: &[PredicateClause]) -> Option<usize> {
let mut optimal_index = None; let mut optimal_index = None;
let has_args = match clauses.first() { let has_args = match clauses.first() {
Some(clause) => match clause.args() { Some(clause) => match clause.args() {
@@ -868,7 +869,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
None => false, None => false,
}; };
if !has_args { if !has_args {
return 0; return optimal_index;
} }
for clause in clauses.iter() { for clause in clauses.iter() {
let args = clause.args().unwrap(); let args = clause.args().unwrap();
@@ -890,10 +891,8 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
} }
} }
} }
match optimal_index {
Some(optimal_index) => optimal_index, optimal_index
None => 0, // Default to first argument indexing.
}
} }
fn split_predicate(clauses: &[PredicateClause], optimal_index: usize) -> Vec<(usize, usize)> { fn split_predicate(clauses: &[PredicateClause], optimal_index: usize) -> Vec<(usize, usize)> {
@@ -996,7 +995,10 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
clauses: &'b Vec<PredicateClause>, clauses: &'b Vec<PredicateClause>,
) -> Result<Code, ParserError> { ) -> Result<Code, ParserError> {
let mut code = Vec::new(); let mut code = Vec::new();
let optimal_index = Self::find_optimal_index(&clauses); let optimal_index = match Self::first_instantiated_index(&clauses) {
Some(index) => index,
None => 0, // Default to first argument indexing.
};
let split_pred = Self::split_predicate(&clauses, optimal_index); let split_pred = Self::split_predicate(&clauses, optimal_index);
let multi_seq = split_pred.len() > 1; let multi_seq = split_pred.len() > 1;