Optimizer should return []interface{} as well.

Author: antonmedv

ast/print.go

@@ -29,17 +29,17 @@ func dump(v reflect.Value, ident string) string {
 		return out + ident + "}"
 	case reflect.Slice:
 		if v.Len() == 0 {
-			return "[]"
+			return t.String() + "{}"
 		}
-		out := "[\n"
+		out := t.String() + "{\n"
 		for i := 0; i < v.Len(); i++ {
 			s := v.Index(i)
 			out += fmt.Sprintf("%v%v,", ident+"\t", dump(s, ident+"\t"))
 			if i+1 < v.Len() {
 				out += "\n"
 			}
 		}
-		return out + "\n" + ident + "]"
+		return out + "\n" + ident + "}"
 	case reflect.Ptr:
 		return dump(v.Elem(), ident)
 	case reflect.Interface:

optimizer/fold.go

@@ -99,34 +99,28 @@ func (fold *fold) Visit(node *Node) {
 
 	case *ArrayNode:
 		if len(n.Nodes) > 0 {
-
-			for _, a := range n.Nodes {
-				if _, ok := a.(*IntegerNode); !ok {
-					goto string
-				}
-			}
-			{
-				value := make([]int, len(n.Nodes))
-				for i, a := range n.Nodes {
-					value[i] = a.(*IntegerNode).Value
-				}
-				patch(&ConstantNode{Value: value})
-			}
-
-		string:
 			for _, a := range n.Nodes {
-				if _, ok := a.(*StringNode); !ok {
+				switch a.(type) {
+				case *IntegerNode, *FloatNode, *StringNode, *BoolNode:
+					continue
+				default:
 					return
 				}
 			}
-			{
-				value := make([]string, len(n.Nodes))
-				for i, a := range n.Nodes {
-					value[i] = a.(*StringNode).Value
+			value := make([]interface{}, len(n.Nodes))
+			for i, a := range n.Nodes {
+				switch b := a.(type) {
+				case *IntegerNode:
+					value[i] = b.Value
+				case *FloatNode:
+					value[i] = b.Value
+				case *StringNode:
+					value[i] = b.Value
+				case *BoolNode:
+					value[i] = b.Value
 				}
-				patch(&ConstantNode{Value: value})
 			}
-
+			patch(&ConstantNode{Value: value})
 		}
 
 	case *BuiltinNode:

optimizer/optimizer_test.go

@@ -21,7 +21,7 @@ func TestOptimize_constant_folding(t *testing.T) {
 	require.NoError(t, err)
 
 	expected := &ast.MemberNode{
-		Node:     &ast.ConstantNode{Value: []int{1, 2, 3}},
+		Node:     &ast.ConstantNode{Value: []interface{}{1, 2, 3}},
 		Property: &ast.IntegerNode{Value: 0},
 	}