removed initializer parameter from newVariableWithLevel

neelance · neelance · commit afe67e2bca22 · 2015-03-07T14:07:00.000+01:00
diff --git a/compiler/package.go b/compiler/package.go
@@ -160,7 +160,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 	var importDecls []*Decl
 	var importedPaths []string
 	for _, importedPkg := range typesPkg.Imports() {
-		c.p.pkgVars[importedPkg.Path()] = c.newVariableWithLevel(importedPkg.Name(), true, "")
+		c.p.pkgVars[importedPkg.Path()] = c.newVariableWithLevel(importedPkg.Name(), true)
 		importedPaths = append(importedPaths, importedPkg.Path())
 	}
 	sort.Strings(importedPaths)
@@ -647,7 +647,9 @@ func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcCo
 				if result.Name() == "_" {
 					name = "result"
 				}
-				c.p.objectVars[result] = c.newVariableWithLevel(name, false, c.zeroValue(result.Type()))
+				varName := c.newVariableWithLevel(name, false)
+				c.Printf("%s = %s;", varName, c.zeroValue(result.Type()))
+				c.p.objectVars[result] = varName
 				id := ast.NewIdent(name)
 				c.p.Uses[id] = result
 				c.resultNames[i] = c.setType(id, result.Type())
diff --git a/compiler/statements.go b/compiler/statements.go
@@ -425,7 +425,7 @@ func (c *funcContext) translateStmt(stmt ast.Stmt, label *types.Label) {
 			for _, spec := range decl.Specs {
 				o := c.p.Defs[spec.(*ast.TypeSpec).Name].(*types.TypeName)
 				c.p.typeNames = append(c.p.typeNames, o)
-				c.p.objectVars[o] = c.newVariableWithLevel(o.Name(), true, "")
+				c.p.objectVars[o] = c.newVariableWithLevel(o.Name(), true)
 				c.p.dependencies[o] = true
 			}
 		case token.CONST:
diff --git a/compiler/utils.go b/compiler/utils.go
@@ -189,10 +189,10 @@ func (c *funcContext) zeroValue(ty types.Type) string {
 }
 
 func (c *funcContext) newVariable(name string) string {
-	return c.newVariableWithLevel(name, false, "")
+	return c.newVariableWithLevel(name, false)
 }
 
-func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool, initializer string) string {
+func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool) string {
 	if name == "" {
 		panic("newVariable: empty name")
 	}
@@ -238,10 +238,6 @@ func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool, initializ
 		return varName
 	}
 
-	if initializer != "" {
-		c.localVars = append(c.localVars, varName+" = "+initializer)
-		return varName
-	}
 	c.localVars = append(c.localVars, varName)
 	return varName
 }
@@ -282,7 +278,7 @@ func (c *funcContext) objectName(o types.Object) string {
 
 	name, found := c.p.objectVars[o]
 	if !found {
-		name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope(), "")
+		name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope())
 		c.p.objectVars[o] = name
 	}
 
@@ -310,7 +306,7 @@ func (c *funcContext) typeName(ty types.Type) string {
 	anonType, ok := c.p.anonTypeMap.At(ty).(*types.TypeName)
 	if !ok {
 		c.initArgs(ty) // cause all embedded types to be registered
-		varName := c.newVariableWithLevel(strings.ToLower(typeKind(ty)[5:])+"Type", true, "")
+		varName := c.newVariableWithLevel(strings.ToLower(typeKind(ty)[5:])+"Type", true)
 		anonType = types.NewTypeName(token.NoPos, c.p.Pkg, varName, ty) // fake types.TypeName
 		c.p.anonTypes = append(c.p.anonTypes, anonType)
 		c.p.anonTypeMap.Set(ty, anonType)

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ func (c funcContext) translateStmt(stmt ast.Stmt, label types.Label) {`
`425`	`425`	`for _, spec := range decl.Specs {`
`426`	`426`	`o := c.p.Defs[spec.(ast.TypeSpec).Name].(types.TypeName)`
`427`	`427`	`c.p.typeNames = append(c.p.typeNames, o)`
`428`		`- c.p.objectVars[o] = c.newVariableWithLevel(o.Name(), true, "")`
	`428`	`+ c.p.objectVars[o] = c.newVariableWithLevel(o.Name(), true)`
`429`	`429`	`c.p.dependencies[o] = true`
`430`	`430`	`}`
`431`	`431`	`case token.CONST:`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,10 @@ func (c *funcContext) zeroValue(ty types.Type) string {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`func (c *funcContext) newVariable(name string) string {`
`192`		`- return c.newVariableWithLevel(name, false, "")`
	`192`	`+ return c.newVariableWithLevel(name, false)`
`193`	`193`	`}`
`194`	`194`
`195`		`-func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool, initializer string) string {`
	`195`	`+func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool) string {`
`196`	`196`	`if name == "" {`
`197`	`197`	`panic("newVariable: empty name")`
`198`	`198`	`}`
`@@ -238,10 +238,6 @@ func (c *funcContext) newVariableWithLevel(name string, pkgLevel bool, initializ`
`238`	`238`	`return varName`
`239`	`239`	`}`
`240`	`240`
`241`		`- if initializer != "" {`
`242`		`- c.localVars = append(c.localVars, varName+" = "+initializer)`
`243`		`- return varName`
`244`		`- }`
`245`	`241`	`c.localVars = append(c.localVars, varName)`
`246`	`242`	`return varName`
`247`	`243`	`}`
`@@ -282,7 +278,7 @@ func (c *funcContext) objectName(o types.Object) string {`
`282`	`278`
`283`	`279`	`name, found := c.p.objectVars[o]`
`284`	`280`	`if !found {`
`285`		`- name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope(), "")`
	`281`	`+ name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope())`
`286`	`282`	`c.p.objectVars[o] = name`
`287`	`283`	`}`
`288`	`284`
`@@ -310,7 +306,7 @@ func (c *funcContext) typeName(ty types.Type) string {`
`310`	`306`	`anonType, ok := c.p.anonTypeMap.At(ty).(*types.TypeName)`
`311`	`307`	`if !ok {`
`312`	`308`	`c.initArgs(ty) // cause all embedded types to be registered`
`313`		`- varName := c.newVariableWithLevel(strings.ToLower(typeKind(ty)[5:])+"Type", true, "")`
	`309`	`+ varName := c.newVariableWithLevel(strings.ToLower(typeKind(ty)[5:])+"Type", true)`
`314`	`310`	`anonType = types.NewTypeName(token.NoPos, c.p.Pkg, varName, ty) // fake types.TypeName`
`315`	`311`	`c.p.anonTypes = append(c.p.anonTypes, anonType)`
`316`	`312`	`c.p.anonTypeMap.Set(ty, anonType)`