Simplified the code, removed first_arg, the Option

src/codegen.rs

@@ -857,16 +857,14 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
         Ok(code)
     }
 
-    fn split_predicate(clauses: &Vec<PredicateClause>, optimal_index: Option<usize>) -> Vec<(usize, usize)> {
+    fn split_predicate(clauses: &Vec<PredicateClause>, optimal_index: usize) -> Vec<(usize, usize)> {
         let mut subseqs = Vec::new();
         let mut left_index = 0;
 
-        if let Some(optimal_i) = optimal_index {
+        if clauses.first().unwrap().args().is_some() {
             for (right_index, clause) in clauses.iter().enumerate() {
-                if clause.args().is_none() {
+                // Can unwrap safely.
-                    continue;
+                if let Some(arg) = clause.args().unwrap().iter().nth(optimal_index) {
-                }
-                if let Some(arg) = clause.args().unwrap().iter().nth(optimal_i) {
                     match **arg {
                         Term::Var(..) | Term::AnonVar => {
                             if left_index < right_index {
@@ -908,7 +906,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
     fn compile_pred_subseq<'b: 'a>(
         &mut self,
         clauses: &'b [PredicateClause],
-        optimal_index: Option<usize>,
+        optimal_index: usize,
     ) -> Result<Code, ParserError> {
         let mut code_body = Vec::new();
         let mut code_offsets = CodeOffsets::new();
@@ -933,18 +931,16 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
                 code_body.push(Line::Choice(choice));
             }
 
-            if let Some(optimal_i) = optimal_index {
+            let arg = match clause.args() {
-                let arg = match clause.args() {
+                Some(args) => match args.iter().nth(optimal_index) {
-                    Some(args) => match args.iter().nth(optimal_i) {
+                    Some(term) => Some(term),
-                        Some(term) => Some(term),
-                        None => None,
-                    },
                     None => None,
-                };
+                },
-                if let Some(arg) = arg {
+                None => None,
-                    let index = code_body.len();
+            };
-                    code_offsets.index_term(arg, index);
+            if let Some(arg) = arg {
-                }
+                let index = code_body.len();
+                code_offsets.index_term(arg, index);
             }
 
             code_body.append(&mut clause_code);
@@ -952,9 +948,8 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
 
         let mut code = Vec::new();
 
-        if let Some(optimal_i) = optimal_index {
+        code_offsets.add_indices(&mut code, code_body, optimal_index + 1);
-            code_offsets.add_indices(&mut code, code_body, optimal_i + 1);
+
-        }
         Ok(code)
     }
 
@@ -993,12 +988,10 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<TermMarker> {
                 }
             }
         }
-        match optimal_index {
+        let optimal_index = match optimal_index {
-            // No good index or no argument, default to 0.
+            Some(optimal_index) => optimal_index,
-            // TODO: Why?
+            None => 0,  // Default to first argument indexing.
-            None => optimal_index = Some(0),
+        };
-            Some(_) => (),
-        }
         let split_pred = Self::split_predicate(&clauses, optimal_index);
         let multi_seq = split_pred.len() > 1;
 

src/forms.rs

@@ -332,13 +332,6 @@ pub enum PredicateClause {
 }
 
 impl PredicateClause {
-    pub fn first_arg(&self) -> Option<&Term> {
-        match self {
-            &PredicateClause::Fact(ref term, ..) => term.first_arg(),
-            &PredicateClause::Rule(ref rule, ..) => rule.head.1.first().map(|bt| bt.as_ref()),
-        }
-    }
-
     // TODO: add this to `Term` in `prolog_parser` like `first_arg`.
     pub fn args(&self) -> Option<&[Box<Term>]> {
         match *self {

src/indexing.rs

@@ -143,8 +143,8 @@ impl CodeOffsets {
         }
     }
 
-    pub fn index_term(&mut self, first_arg: &Term, index: usize) {
+    pub fn index_term(&mut self, optimal_arg: &Term, index: usize) {
-        match first_arg {
+        match optimal_arg {
             &Term::Clause(_, ref name, ref terms, _) => {
                 let code = self
                     .structures