Fix optimizer for in array

Author: antonmedv

expr_test.go

@@ -380,8 +380,8 @@ func TestExpr(t *testing.T) {
 			2,
 		},
 		{
-			`2 ** 4`,
-			float64(16),
+			`2 ** 8`,
+			float64(256),
 		},
 		{
 			`-(2-5)**3-2/(+4-3)+-2`,
@@ -407,6 +407,22 @@ func TestExpr(t *testing.T) {
 			`Int64 in 0..1`,
 			true,
 		},
+		{
+			`1 in [1, 2, 3] && "foo" in {foo: 0, bar: 1} && "Price" in Ticket`,
+			true,
+		},
+		{
+			`1 in [1.5] || 1 not in [1]`,
+			false,
+		},
+		{
+			`One in 0..1 && Two not in 0..1`,
+			true,
+		},
+		{
+			`Int32 in [10, 20]`,
+			false,
+		},
 		{
 			`String matches "s.+"`,
 			true,
@@ -467,14 +483,6 @@ func TestExpr(t *testing.T) {
 			`{foo: 0, bar: 1}`,
 			map[string]interface{}{"foo": 0, "bar": 1},
 		},
-		{
-			`1 in [1, 2, 3] && "foo" in {foo: 0, bar: 1} && "Price" in Ticket`,
-			true,
-		},
-		{
-			`1 in [1.5] || 1 not in [1]`,
-			false,
-		},
 		{
 			`(true ? 0+1 : 2+3) + (false ? -1 : -2)`,
 			-1,
@@ -579,18 +587,10 @@ func TestExpr(t *testing.T) {
 			`Array[:] == Array`,
 			true,
 		},
-		{
-			`One in 0..1 && Two not in 0..1`,
-			true,
-		},
 		{
 			`1 + 2 + Three`,
 			6,
 		},
-		{
-			`2 ** 8`,
-			float64(256),
-		},
 	}
 
 	for _, tt := range tests {

optimizer/optimizer.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	. "github.com/antonmedv/expr/ast"
 	"math"
+	"reflect"
 )
 
 type inArray struct{}
@@ -43,6 +44,13 @@ func (*inArray) Exit(node *Node) {
 	switch n := (*node).(type) {
 	case *BinaryNode:
 		if n.Operator == "in" || n.Operator == "not in" {
+			t := n.Left.GetType()
+			if t == nil || n.Left.GetType().Kind() != reflect.Int {
+				// This optimization can be only performed if left side is int type,
+				// as runtime.in func uses reflect.Map.MapIndex and keys of map must,
+				// be same as checked value type.
+				return
+			}
 			if array, ok := n.Right.(*ArrayNode); ok {
 				if len(array.Nodes) > 0 {
 

optimizer/optimizer_test.go

@@ -2,6 +2,8 @@ package optimizer_test
 
 import (
 	"github.com/antonmedv/expr/ast"
+	"github.com/antonmedv/expr/checker"
+	"github.com/antonmedv/expr/internal/conf"
 	"github.com/antonmedv/expr/optimizer"
 	"github.com/antonmedv/expr/parser"
 	"github.com/sanity-io/litter"
@@ -25,9 +27,14 @@ func TestOptimize_constant_folding(t *testing.T) {
 }
 
 func TestOptimize_in_array(t *testing.T) {
+	config := conf.New(map[string]int{"v": 0})
+
 	tree, err := parser.Parse(`v in [1,2,3]`)
 	require.NoError(t, err)
 
+	_, err = checker.Check(tree, config)
+	require.NoError(t, err)
+
 	optimizer.Optimize(&tree.Node)
 
 	expected := &ast.BinaryNode{