feat: ensure that untyped values are converted to the same type (#1677)

secDre4mer · mvertes · web-flow · commit 1e3e91df86cc · 2025-01-08T14:36:03.000+01:00
Co-authored-by: Marc Vertes &lt;mvertes@free.fr&gt;
diff --git a/interp/typecheck.go b/interp/typecheck.go
@@ -270,6 +270,7 @@ func (check typecheck) binaryExpr(n *node) error {
 		}
 	}
 
+	// Ensure that if values are untyped, both are converted to the same type
 	_ = check.convertUntyped(c0, c1.typ)
 	_ = check.convertUntyped(c1, c0.typ)
 
@@ -1059,7 +1060,7 @@ func (check typecheck) convertUntyped(n *node, typ *itype) error {
 		// Both n and target are untyped.
 		nkind, tkind := ntyp.Kind(), ttyp.Kind()
 		if isNumber(ntyp) && isNumber(ttyp) {
-			if nkind < tkind {
+			if nkind <= tkind {
 				n.typ = typ
 			}
 		} else if nkind != tkind {

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ func (check typecheck) binaryExpr(n *node) error {`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`
	`273`	`+ // Ensure that if values are untyped, both are converted to the same type`
`273`	`274`	`_ = check.convertUntyped(c0, c1.typ)`
`274`	`275`	`_ = check.convertUntyped(c1, c0.typ)`
`275`	`276`
`@@ -1059,7 +1060,7 @@ func (check typecheck) convertUntyped(n node, typ itype) error {`
`1059`	`1060`	`// Both n and target are untyped.`
`1060`	`1061`	`nkind, tkind := ntyp.Kind(), ttyp.Kind()`
`1061`	`1062`	`if isNumber(ntyp) && isNumber(ttyp) {`
`1062`		`- if nkind < tkind {`
	`1063`	`+ if nkind <= tkind {`
`1063`	`1064`	`n.typ = typ`
`1064`	`1065`	`}`
`1065`	`1066`	`} else if nkind != tkind {`