interp: improve handling values and comparisons in interfaces

Fixes #1347.
traefik · May 23, 2022 · d64563e · d64563e
1 parent 0703926
commit d64563e
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 12 deletions.
diff --git a/internal/cmd/genop/genop.go b/internal/cmd/genop/genop.go
diff --git a/interp/ast.go b/interp/ast.go
@@ -282,6 +282,7 @@ var actions = [...]string{
 	aDec:          "--",
 	aEqual:        "==",
 	aGreater:      ">",
+	aGreaterEqual: ">=",
 	aGetFunc:      "getFunc",
 	aGetIndex:     "getIndex",
 	aGetMethod:    "getMethod",
@@ -290,6 +291,7 @@ var actions = [...]string{
 	aLand:         "&&",
 	aLor:          "||",
 	aLower:        "<",
+	aLowerEqual:   "<=",
 	aMethod:       "Method",
 	aMul:          "*",
 	aMulAssign:    "*=",

diff --git a/interp/interp_eval_test.go b/interp/interp_eval_test.go
@@ -450,6 +450,14 @@ func TestEvalComparison(t *testing.T) {
 		},
 		{src: `1 > _`, err: "1:28: cannot use _ as value"},
 		{src: `(_) > 1`, err: "1:28: cannot use _ as value"},
+		{src: `v := interface{}(2); v == 2`, res: "true"},
+		{src: `v := interface{}(2); v > 1`, err: "1:49: invalid operation: operator > not defined on interface{}"},
+		{src: `v := interface{}(int64(2)); v == 2`, res: "false"},
+		{src: `v := interface{}(int64(2)); v != 2`, res: "true"},
+		{src: `v := interface{}(2.3); v == 2.3`, res: "true"},
+		{src: `v := interface{}(float32(2.3)); v != 2.3`, res: "true"},
+		{src: `v := interface{}("hello"); v == "hello"`, res: "true"},
+		{src: `v := interface{}("hello"); v < "hellp"`, err: "1:55: invalid operation: operator < not defined on interface{}"},
 	})
 }
 

diff --git a/interp/op.go b/interp/op.go
diff --git a/interp/typecheck.go b/interp/typecheck.go
@@ -202,7 +202,7 @@ func (check typecheck) comparison(n *node) error {
 		if typ.isNil() {
 			typ = c1.typ
 		}
-		return n.cfgErrorf("invalid operation: operator %v not defined on %s", n.action, typ.id(), ".")
+		return n.cfgErrorf("invalid operation: operator %v not defined on %s", n.action, typ.id())
 	}
 	return nil
 }

diff --git a/interp/value.go b/interp/value.go
@@ -596,9 +596,5 @@ func genComplex(n *node) func(*frame) complex128 {
 func genValueString(n *node) func(*frame) (reflect.Value, string) {
 	value := genValue(n)
 
-	if n.typ.TypeOf().Kind() == reflect.Interface {
-		return func(f *frame) (reflect.Value, string) { v := value(f); return v, v.Elem().String() }
-	}
-
 	return func(f *frame) (reflect.Value, string) { v := value(f); return v, v.String() }
 }