Merge pull request #503 from xushiwei/q

cb.ConvertToClosure

Author: xushiwei

codebuild.go

@@ -620,6 +620,18 @@ func (p *CodeBuilder) NewClosureWith(sig *types.Signature) *Func {
 	return p.pkg.newClosure(sig)
 }
 
+// ConvertToClosure converts an expression into a closure.
+func (p *CodeBuilder) ConvertToClosure() *CodeBuilder {
+	pkg := p.pkg
+	e := p.stk.Pop()
+	ret := pkg.NewParam(token.NoPos, "", types.Default(e.Type))
+	p.NewClosure(nil, types.NewTuple(ret), false).BodyStart(pkg)
+	p.emitStmt(&ast.ReturnStmt{
+		Results: []ast.Expr{e.Val},
+	})
+	return p.End()
+}
+
 // NewType func
 func (p *CodeBuilder) NewType(name string, src ...ast.Node) *TypeDecl {
 	return p.NewTypeDefs().NewType(name, src...)

gop_test.go

@@ -57,6 +57,21 @@ func newGopMainPackage() *gogen.Package {
 
 // ----------------------------------------------------------------------------
 
+func TestConvertToClosure(t *testing.T) {
+	pkg := newMainPackage()
+	pkg.NewFunc(nil, "main", nil, nil, false).BodyStart(pkg).
+		DefineVarStart(0, "x").Val(1).ConvertToClosure().EndInit(1).
+		End()
+	domTest(t, pkg, `package main
+
+func main() {
+	x := func() int {
+		return 1
+	}
+}
+`)
+}
+
 func TestGopoConst(t *testing.T) {
 	pkg := newPackage("foo", false)
 	pkg.CB().NewConstStart(nil, "Gopo_x").