Tentative fix for some cases where stage reordering borks comparators…

… and logicalops
Knetic · Oct 11, 2016 · 8435889 · 8435889
1 parent 583582e
commit 8435889
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/evaluation_test.go b/evaluation_test.go
@@ -1067,6 +1067,54 @@ func TestParameterizedEvaluation(test *testing.T) {
 			},
 			Expected: 1.0,
 		},
+		EvaluationTest{
+
+			Name:  "Multiple comparator/logical operators (#30)",
+			Input: "(foo >= 2887057408 && foo <= 2887122943) || (foo >= 168100864 && foo <= 168118271)",
+			Parameters: []EvaluationParameter{
+				EvaluationParameter{
+					Name:  "foo",
+					Value: 2887057409,
+				},
+			},
+			Expected: true,
+		},
+		EvaluationTest{
+
+			Name:  "Multiple comparator/logical operators, opposite order (#30)",
+			Input: "(foo >= 168100864 && foo <= 168118271) || (foo >= 2887057408 && foo <= 2887122943)",
+			Parameters: []EvaluationParameter{
+				EvaluationParameter{
+					Name:  "foo",
+					Value: 2887057409,
+				},
+			},
+			Expected: true,
+		},
+		EvaluationTest{
+
+			Name:  "Multiple comparator/logical operators, small value (#30)",
+			Input: "(foo >= 2887057408 && foo <= 2887122943) || (foo >= 168100864 && foo <= 168118271)",
+			Parameters: []EvaluationParameter{
+				EvaluationParameter{
+					Name:  "foo",
+					Value: 168100865,
+				},
+			},
+			Expected: true,
+		},
+		EvaluationTest{
+
+			Name:  "Multiple comparator/logical operators, small value, opposite order (#30)",
+			Input: "(foo >= 168100864 && foo <= 168118271) || (foo >= 2887057408 && foo <= 2887122943)",
+			Parameters: []EvaluationParameter{
+				EvaluationParameter{
+					Name:  "foo",
+					Value: 168100865,
+				},
+			},
+			Expected: true,
+		},
 		EvaluationTest{
 
 			Name:  "Mixed function and parameters",

diff --git a/stagePlanner.go b/stagePlanner.go
@@ -499,6 +499,10 @@ func reorderStages(rootStage *evaluationStage) {
 
 		currentPrecedence = findOperatorPrecedenceForSymbol(currentStage.symbol)
 
+		if currentPrecedence == COMPARATOR_PRECEDENCE || currentPrecedence == LOGICAL_PRECEDENCE {
+			continue
+		}
+
 		if currentPrecedence == precedence {
 			identicalPrecedences = append(identicalPrecedences, currentStage)
 			continue