clean up, fixed test

gnolang · Jul 31, 2024 · e108f69 · e108f69
1 parent c94aff0
commit e108f69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
@@ -2172,15 +2172,20 @@ func Preprocess(store Store, ctx BlockNode, n Node) Node {
 
 					var tuple *tupleType
 					valueExpr := n.Values[0]
+					valueType := evalStaticTypeOfRaw(store, last, valueExpr)
+
 					switch expr := valueExpr.(type) {
 					case *CallExpr:
-						tuple = evalStaticTypeOfRaw(store, last, expr).(*tupleType)
+						tuple = valueType.(*tupleType)
 					case *TypeAssertExpr, *IndexExpr:
-						valueType := evalStaticTypeOfRaw(store, last, expr)
 						tuple = &tupleType{Elts: []Type{valueType, BoolType}}
+						if ex, ok := expr.(*TypeAssertExpr); ok {
+							ex.HasOK = true
+							break
+						}
+						expr.(*IndexExpr).HasOK = true
 					default:
 						panic(fmt.Sprintf("unexpected ValueDecl value expression type %T", expr))
-
 					}
 
 					if rLen := len(tuple.Elts); rLen != numNames {

diff --git a/gnovm/tests/files/vardecl.gno b/gnovm/tests/files/vardecl.gno
@@ -2,14 +2,14 @@ package main
 
 func main() {
 	var i interface{} = 1
-	a, ok := i.(int)
+	var a, ok = i.(int)
 	println(a, ok)
 
-	b, c := doSomething()
+	var b, c = doSomething()
 	println(b, c)
 
 	m := map[string]int{"a": 1, "b": 2}
-	d, okk := m["d"]
+	var d, okk = m["d"]
 	println(d, okk)
 }