refactored translateFunction

neelance · neelance · commit ddcb2f6c355e · 2015-03-07T18:46:27.000+01:00
diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -179,17 +179,17 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 		}
 
 	case *ast.FuncLit:
-		params, body := translateFunction(e.Type, e.Body.List, c, exprType.(*types.Signature), c.p.FuncLitInfos[e], "")
+		_, fun := translateFunction(e.Type, e.Body.List, c, exprType.(*types.Signature), c.p.FuncLitInfos[e], "")
 		if len(c.p.escapingVars) != 0 {
 			names := make([]string, 0, len(c.p.escapingVars))
 			for obj := range c.p.escapingVars {
 				names = append(names, c.p.objectVars[obj])
 			}
 			sort.Strings(names)
 			list := strings.Join(names, ", ")
-			return c.formatExpr("(function(%s) { return function(%s) {\n%s%s}; })(%s)", list, strings.Join(params, ", "), string(body), strings.Repeat("\t", c.p.indentation), list)
+			return c.formatExpr("(function(%s) { return %s; })(%s)", list, fun, list)
 		}
-		return c.formatExpr("(function(%s) {\n%s%s})", strings.Join(params, ", "), string(body), strings.Repeat("\t", c.p.indentation))
+		return c.formatExpr("(%s)", fun)
 
 	case *ast.UnaryExpr:
 		t := c.p.Types[e.X].Type
diff --git a/compiler/package.go b/compiler/package.go
@@ -552,9 +552,9 @@ func (c *funcContext) translateToplevelFunction(fun *ast.FuncDecl, info *analysi
 				},
 			}, stmts...)
 		}
-		params, body := translateFunction(fun.Type, stmts, c, sig, info, fun.Name.Name)
+		params, fun := translateFunction(fun.Type, stmts, c, sig, info, fun.Name.Name)
 		joinedParams = strings.Join(params, ", ")
-		return []byte(fmt.Sprintf("\t%s = function(%s) {\n%s\t};\n", lhs, joinedParams, string(body)))
+		return []byte(fmt.Sprintf("\t%s = %s;\n", lhs, fun))
 	}
 
 	if fun.Recv == nil {
@@ -603,7 +603,7 @@ func (c *funcContext) translateToplevelFunction(fun *ast.FuncDecl, info *analysi
 	return code.Bytes()
 }
 
-func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcContext, sig *types.Signature, info *analysis.FuncInfo, name string) ([]string, []byte) {
+func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcContext, sig *types.Signature, info *analysis.FuncInfo, name string) ([]string, string) {
 	c := &funcContext{
 		FuncInfo:    info,
 		p:           outerContext.p,
@@ -638,7 +638,7 @@ func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcCo
 		c.localVars = append(c.localVars, "$this = this")
 	}
 
-	body := c.CatchOutput(1, func() {
+	body := string(c.CatchOutput(1, func() {
 		if c.sig != nil && c.sig.Results().Len() != 0 && c.sig.Results().At(0).Name() != "" {
 			c.resultNames = make([]ast.Expr, c.sig.Results().Len())
 			for i := 0; i < c.sig.Results().Len(); i++ {
@@ -720,12 +720,12 @@ func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcCo
 		if suffix != "" {
 			c.Printf("/* */%s", suffix)
 		}
-	})
+	}))
 
 	if len(c.localVars) != 0 {
 		sort.Strings(c.localVars)
-		body = append([]byte(fmt.Sprintf("%svar %s;\n", strings.Repeat("\t", c.p.indentation+1), strings.Join(c.localVars, ", "))), body...)
+		body = fmt.Sprintf("%svar %s;\n", strings.Repeat("\t", c.p.indentation+1), strings.Join(c.localVars, ", ")) + body
 	}
 
-	return params, body
+	return params, fmt.Sprintf("function(%s) {\n%s%s}", strings.Join(params, ", "), body, strings.Repeat("\t", c.p.indentation))
 }

Original file line number	Diff line number	Diff line change
`@@ -179,17 +179,17 @@ func (c funcContext) translateExpr(expr ast.Expr) expression {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`case *ast.FuncLit:`
`182`		`- params, body := translateFunction(e.Type, e.Body.List, c, exprType.(*types.Signature), c.p.FuncLitInfos[e], "")`
	`182`	`+ _, fun := translateFunction(e.Type, e.Body.List, c, exprType.(*types.Signature), c.p.FuncLitInfos[e], "")`
`183`	`183`	`if len(c.p.escapingVars) != 0 {`
`184`	`184`	`names := make([]string, 0, len(c.p.escapingVars))`
`185`	`185`	`for obj := range c.p.escapingVars {`
`186`	`186`	`names = append(names, c.p.objectVars[obj])`
`187`	`187`	`}`
`188`	`188`	`sort.Strings(names)`
`189`	`189`	`list := strings.Join(names, ", ")`
`190`		`- return c.formatExpr("(function(%s) { return function(%s) {\n%s%s}; })(%s)", list, strings.Join(params, ", "), string(body), strings.Repeat("\t", c.p.indentation), list)`
	`190`	`+ return c.formatExpr("(function(%s) { return %s; })(%s)", list, fun, list)`
`191`	`191`	`}`
`192`		`- return c.formatExpr("(function(%s) {\n%s%s})", strings.Join(params, ", "), string(body), strings.Repeat("\t", c.p.indentation))`
	`192`	`+ return c.formatExpr("(%s)", fun)`
`193`	`193`
`194`	`194`	`case *ast.UnaryExpr:`
`195`	`195`	`t := c.p.Types[e.X].Type`
Original file line number	Diff line number	Diff line change
`@@ -552,9 +552,9 @@ func (c funcContext) translateToplevelFunction(fun ast.FuncDecl, info *analysi`
`552`	`552`	`},`
`553`	`553`	`}, stmts...)`
`554`	`554`	`}`
`555`		`- params, body := translateFunction(fun.Type, stmts, c, sig, info, fun.Name.Name)`
	`555`	`+ params, fun := translateFunction(fun.Type, stmts, c, sig, info, fun.Name.Name)`
`556`	`556`	`joinedParams = strings.Join(params, ", ")`
`557`		`- return []byte(fmt.Sprintf("\t%s = function(%s) {\n%s\t};\n", lhs, joinedParams, string(body)))`
	`557`	`+ return []byte(fmt.Sprintf("\t%s = %s;\n", lhs, fun))`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`if fun.Recv == nil {`
`@@ -603,7 +603,7 @@ func (c funcContext) translateToplevelFunction(fun ast.FuncDecl, info *analysi`
`603`	`603`	`return code.Bytes()`
`604`	`604`	`}`
`605`	`605`
`606`		`-func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcContext, sig types.Signature, info analysis.FuncInfo, name string) ([]string, []byte) {`
	`606`	`+func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcContext, sig types.Signature, info analysis.FuncInfo, name string) ([]string, string) {`
`607`	`607`	`c := &funcContext{`
`608`	`608`	`FuncInfo: info,`
`609`	`609`	`p: outerContext.p,`
`@@ -638,7 +638,7 @@ func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcCo`
`638`	`638`	`c.localVars = append(c.localVars, "$this = this")`
`639`	`639`	`}`
`640`	`640`
`641`		`- body := c.CatchOutput(1, func() {`
	`641`	`+ body := string(c.CatchOutput(1, func() {`
`642`	`642`	`if c.sig != nil && c.sig.Results().Len() != 0 && c.sig.Results().At(0).Name() != "" {`
`643`	`643`	`c.resultNames = make([]ast.Expr, c.sig.Results().Len())`
`644`	`644`	`for i := 0; i < c.sig.Results().Len(); i++ {`
`@@ -720,12 +720,12 @@ func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcCo`
`720`	`720`	`if suffix != "" {`
`721`	`721`	`c.Printf("/* */%s", suffix)`
`722`	`722`	`}`
`723`		`- })`
	`723`	`+ }))`
`724`	`724`
`725`	`725`	`if len(c.localVars) != 0 {`
`726`	`726`	`sort.Strings(c.localVars)`
`727`		`- body = append([]byte(fmt.Sprintf("%svar %s;\n", strings.Repeat("\t", c.p.indentation+1), strings.Join(c.localVars, ", "))), body...)`
	`727`	`+ body = fmt.Sprintf("%svar %s;\n", strings.Repeat("\t", c.p.indentation+1), strings.Join(c.localVars, ", ")) + body`
`728`	`728`	`}`
`729`	`729`
`730`		`- return params, body`
	`730`	`+ return params, fmt.Sprintf("function(%s) {\n%s%s}", strings.Join(params, ", "), body, strings.Repeat("\t", c.p.indentation))`
`731`	`731`	`}`