Merge pull request #2739 from xushiwei/q

cl compileComprehensionExpr: use cb.MoveLastStmtTo instead of pkg.NewAutoParam

Author: xushiwei

cl/expr.go

@@ -1991,24 +1991,23 @@ func compileComprehensionExpr(ctx *blockCtx, lhs int, v *ast.ComprehensionExpr)
 	)
 	kind := comprehensionKind(v)
 	pkg, cb := ctx.pkg, ctx.cb
+	pkgTypes := pkg.Types
 	var results *types.Tuple
 	var ret *types.Var
 	if v.Elt == nil {
-		boolean := pkg.NewParam(token.NoPos, nameOk, types.Typ[types.Bool])
+		boolean := types.NewParam(token.NoPos, pkgTypes, nameOk, types.Typ[types.Bool])
 		results = types.NewTuple(boolean)
 	} else {
-		ret = pkg.NewAutoParam(nameRet)
+		// use tyInvalid as unbounded return type
+		ret = types.NewParam(token.NoPos, pkgTypes, nameRet, types.Typ[types.Invalid])
 		if kind == comprehensionSelect && lhs == 2 {
-			boolean := pkg.NewParam(token.NoPos, nameOk, types.Typ[types.Bool])
+			boolean := types.NewParam(token.NoPos, pkgTypes, nameOk, types.Typ[types.Bool])
 			results = types.NewTuple(ret, boolean)
 		} else {
 			results = types.NewTuple(ret)
 		}
 	}
 	cb.NewClosure(nil, results, false).BodyStart(pkg)
-	if kind == comprehensionMap {
-		cb.VarRef(ret).ZeroLit(ret.Type()).Assign(1)
-	}
 	end := 0
 	for i := len(v.Fors) - 1; i >= 0; i-- {
 		names := make([]string, 0, 2)
@@ -2040,21 +2039,30 @@ func compileComprehensionExpr(ctx *blockCtx, lhs int, v *ast.ComprehensionExpr)
 		}
 		end++
 	}
+	stk := cb.InternalStack()
 	switch kind {
 	case comprehensionList:
 		// _xgo_ret = append(_xgo_ret, elt)
+		compileExpr(ctx, 1, v.Elt)
+		e := stk.Pop()
+		*ret = *types.NewVar(token.NoPos, pkgTypes, nameRet, types.NewSlice(e.Type))
 		cb.VarRef(ret)
 		cb.Val(pkg.Builtin().Ref("append"))
 		cb.Val(ret)
-		compileExpr(ctx, 1, v.Elt)
+		stk.Push(e)
 		cb.Call(2).Assign(1)
 	case comprehensionMap:
 		// _xgo_ret[key] = val
-		cb.Val(ret)
 		kv := v.Elt.(*ast.KeyValueExpr)
 		compileExpr(ctx, 1, kv.Key)
-		cb.IndexRef(1)
+		key := stk.Pop()
 		compileExpr(ctx, 1, kv.Value)
+		val := stk.Pop()
+		*ret = *types.NewVar(token.NoPos, pkgTypes, nameRet, types.NewMap(key.Type, val.Type))
+		cb.Val(ret)
+		stk.Push(key)
+		cb.IndexRef(1)
+		stk.Push(val)
 		cb.Assign(1)
 	default:
 		if v.Elt == nil {
@@ -2064,6 +2072,8 @@ func compileComprehensionExpr(ctx *blockCtx, lhs int, v *ast.ComprehensionExpr)
 		} else {
 			// return elt, true
 			compileExpr(ctx, 1, v.Elt)
+			e := stk.Get(-1)
+			*ret = *types.NewVar(token.NoPos, pkgTypes, nameRet, e.Type)
 			n := 1
 			if lhs == 2 {
 				cb.Val(true)
@@ -2075,6 +2085,9 @@ func compileComprehensionExpr(ctx *blockCtx, lhs int, v *ast.ComprehensionExpr)
 	for i := 0; i < end; i++ {
 		cb.End()
 	}
+	if kind == comprehensionMap {
+		cb.VarRef(ret).MapLit(ret.Type(), 0, v).Assign(1).MoveLastStmtTo(0)
+	}
 	cb.Return(0).End().Call(0)
 }
 

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/fsnotify/fsnotify v1.10.1
 	github.com/goccy/go-yaml v1.19.2
 	github.com/goplus/cobra v1.10.7 //xgo:class
-	github.com/goplus/gogen v1.23.0-pre.3.0.20260414234848-6641c10c9d6f
+	github.com/goplus/gogen v1.23.0-pre.3.0.20260521054245-6cb1c229ef46
 	github.com/goplus/lib v0.3.1
 	github.com/goplus/mod v0.20.2
 	github.com/qiniu/x v1.17.0

go.sum

@@ -4,8 +4,8 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
 github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/goplus/cobra v1.10.7 h1:pdMf0tzzAQn8941Ac1m78SSeTMQaSKihy/ipvANbLnc=
 github.com/goplus/cobra v1.10.7/go.mod h1:p4LhfNJDKEpiGjGiNn0crUXL5dUPA5DX2ztYpEJR34E=
-github.com/goplus/gogen v1.23.0-pre.3.0.20260414234848-6641c10c9d6f h1:qb3VcmljqvrIgEVbs83cbZkckszvtHl3OnO/ums8Zoc=
-github.com/goplus/gogen v1.23.0-pre.3.0.20260414234848-6641c10c9d6f/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
+github.com/goplus/gogen v1.23.0-pre.3.0.20260521054245-6cb1c229ef46 h1:LFDRVt3fH2e0wi1C/oRFwg0+ujfEN3YsArT2ZvK1hls=
+github.com/goplus/gogen v1.23.0-pre.3.0.20260521054245-6cb1c229ef46/go.mod h1:Y7ulYW3wonQ3d9er00b0uGFEV/IUZa6okWJZh892ACQ=
 github.com/goplus/lib v0.3.1 h1:Xws4DBVvgOMu58awqB972wtvTacDbk3nqcbHjdx9KSg=
 github.com/goplus/lib v0.3.1/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
 github.com/goplus/mod v0.20.2 h1:YX72E6AhhRLvlkVnI9cBK6PZvUwtge2hwROh7w9N6Yk=