#23 removed automatic nil to string convertion in operators

PaesslerAG · May 3, 2019 · 0e8a262 · 0e8a262
1 parent 4f1cfd4
commit 0e8a262
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/gval_evaluationFailure_test.go b/gval_evaluationFailure_test.go
@@ -360,6 +360,11 @@ func TestModifierTyping(test *testing.T) {
 			})),
 			wantErr: "test error",
 		},
+		{
+			name:       "eval `nil > 1` returns true #23",
+			expression: `nil > 1`,
+			wantErr:    "invalid operation (<nil>) > (float64)",
+		},
 	}
 
 	for i := range evaluationTests {

diff --git a/operator.go b/operator.go
@@ -112,7 +112,10 @@ type opFunc func(a, b interface{}) (interface{}, error)
 func getStringOpFunc(s func(a, b string) (interface{}, error), f opFunc, typeConversion bool) opFunc {
 	if typeConversion {
 		return func(a, b interface{}) (interface{}, error) {
-			return s(fmt.Sprintf("%v", a), fmt.Sprintf("%v", b))
+			if a != nil && b != nil {
+				return s(fmt.Sprintf("%v", a), fmt.Sprintf("%v", b))
+			}
+			return f(a, b)
 		}
 	}
 	return func(a, b interface{}) (interface{}, error) {