refactor: better signatures

Author: MilesCranmer

src/Evaluate.jl

@@ -344,7 +344,7 @@ end
         return quote
             op = operators.binops[op_idx]
             special_operator(op) &&
-                return deg2_eval_special(tree, cX, op, eval_options, operators)
+                return deg2_eval_special(tree, cX, operators, op, eval_options)
             result_l = _eval_tree_array(tree.l, cX, operators, eval_options)
             !result_l.ok && return result_l
             @return_on_nonfinite_array(eval_options, result_l.x)
@@ -361,7 +361,7 @@ end
             i -> i == op_idx,
             i -> let op = operators.binops[i]
                 if special_operator(op)
-                    deg2_eval_special(tree, cX, op, eval_options, operators)
+                    deg2_eval_special(tree, cX, operators, op, eval_options)
                 elseif tree.l.degree == 0 && tree.r.degree == 0
                     deg2_l0_r0_eval(tree, cX, op, eval_options)
                 elseif tree.r.degree == 0
@@ -406,7 +406,7 @@ end
         return quote
             op = operators.unaops[op_idx]
             special_operator(op) &&
-                return deg1_eval_special(tree, cX, op, eval_options, operators)
+                return deg1_eval_special(tree, cX, operators, op, eval_options)
             result = _eval_tree_array(tree.l, cX, operators, eval_options)
             !result.ok && return result
             @return_on_nonfinite_array(eval_options, result.x)
@@ -421,7 +421,7 @@ end
             i -> i == op_idx,
             i -> let op = operators.unaops[i]
                 if special_operator(op)
-                    deg1_eval_special(tree, cX, op, eval_options, operators)
+                    deg1_eval_special(tree, cX, operators, op, eval_options)
                 elseif !$(special_operators) &&
                     tree.l.degree == 2 &&
                     tree.l.l.degree == 0 &&

src/SpecialOperators.jl

@@ -25,7 +25,7 @@ end
 @inline special_operator(::Type{AssignOperator}) = true
 get_op_name(o::AssignOperator) = "[{FEATURE_" * string(o.target_register) * "} =]"
 
-function deg1_eval_special(tree, cX, op::AssignOperator, eval_options, operators)
+function deg1_eval_special(tree, cX, operators, op::AssignOperator, eval_options)
     result = _eval_tree_array(tree.l, cX, operators, eval_options)
     !result.ok && return result
     @return_on_nonfinite_array(eval_options, result.x)
@@ -45,7 +45,7 @@ end
 get_op_name(o::WhileOperator) = "while"
 
 # TODO: Need to void any instance of buffer when using while loop.
-function deg2_eval_special(tree, cX, op::WhileOperator, eval_options, operators)
+function deg2_eval_special(tree, cX, operators, op::WhileOperator, eval_options)
     cond = tree.l
     body = tree.r
     mask = trues(size(cX, 2))