improved performance of pointers

neelance · neelance · commit 923aee9f2196 · 2015-03-10T13:34:54.000+01:00
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -175,7 +175,7 @@ func WritePkgCode(pkg *Archive, minify bool, w *SourceMapFilter) error {
 	if _, err := w.Write(removeWhitespace([]byte(fmt.Sprintf("$packages[\"%s\"] = (function() {\n", pkg.ImportPath)), minify)); err != nil {
 		return err
 	}
-	vars := []string{"$pkg = {}", "$ptr = {}", "$init"}
+	vars := []string{"$pkg = {}", "$init"}
 	var filteredDecls []*Decl
 	for _, d := range pkg.Declarations {
 		if d.DceObjectFilter == "" && d.DceMethodFilter == "" {
diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -212,7 +212,7 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 				if c.p.escapingVars[obj] {
 					return c.formatExpr("(%1s.$ptr || (%1s.$ptr = new %2s(function() { return this.$target[0]; }, function($v) { this.$target[0] = $v; }, %1s)))", c.p.objectVars[obj], c.typeName(exprType))
 				}
-				return c.formatExpr("($ptr.%1s || ($ptr.%1s = new %2s(function() { return %1s; }, function($v) { %3s })))", c.p.objectVars[obj], c.typeName(exprType), c.translateAssign(x, "$v", exprType, false))
+				return c.formatExpr(`(%1s || (%1s = new %2s(function() { return %3s; }, function($v) { %4s })))`, c.varPtrName(obj), c.typeName(exprType), c.objectName(obj), c.translateAssign(x, "$v", exprType, false))
 			case *ast.SelectorExpr:
 				newSel := &ast.SelectorExpr{X: c.newIdent("this.$target", c.p.Types[x.X].Type), Sel: x.Sel}
 				c.p.Selections[newSel] = c.p.Selections[x]
diff --git a/compiler/package.go b/compiler/package.go
@@ -20,6 +20,7 @@ type pkgContext struct {
 	typeNames    []*types.TypeName
 	pkgVars      map[string]string
 	objectVars   map[types.Object]string
+	varPtrNames  map[types.Object]string
 	anonTypes    []*types.TypeName
 	anonTypeMap  typeutil.Map
 	escapingVars map[*types.Var]bool
@@ -142,6 +143,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 			Info:         pkgInfo,
 			pkgVars:      make(map[string]string),
 			objectVars:   make(map[types.Object]string),
+			varPtrNames:  make(map[types.Object]string),
 			escapingVars: make(map[*types.Var]bool),
 			indentation:  1,
 			dependencies: make(map[types.Object]bool),
@@ -721,8 +723,6 @@ func translateFunction(typ *ast.FuncType, initStmts []ast.Stmt, body *ast.BlockS
 		prefix = prefix + " $deferred = []; $deferred.index = $curGoroutine.deferStack.length; $curGoroutine.deferStack.push($deferred);"
 	}
 
-	prefix = prefix + " $ptr = {};"
-
 	if prefix != "" {
 		bodyOutput = strings.Repeat("\t", c.p.indentation+1) + "/* */" + prefix + "\n" + bodyOutput
 	}
diff --git a/compiler/utils.go b/compiler/utils.go
@@ -278,8 +278,8 @@ func (c *funcContext) objectName(o types.Object) string {
 		}
 	}
 
-	name, found := c.p.objectVars[o]
-	if !found {
+	name, ok := c.p.objectVars[o]
+	if !ok {
 		name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope())
 		c.p.objectVars[o] = name
 	}
@@ -290,6 +290,15 @@ func (c *funcContext) objectName(o types.Object) string {
 	return name
 }
 
+func (c *funcContext) varPtrName(o types.Object) string {
+	name, ok := c.p.varPtrNames[o]
+	if !ok {
+		name = c.newVariableWithLevel(o.Name()+"$ptr", o.Parent() == c.p.Pkg.Scope())
+		c.p.varPtrNames[o] = name
+	}
+	return name
+}
+
 func (c *funcContext) typeName(ty types.Type) string {
 	switch t := ty.(type) {
 	case *types.Basic:

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func WritePkgCode(pkg Archive, minify bool, w SourceMapFilter) error {`
`175`	`175`	`if _, err := w.Write(removeWhitespace([]byte(fmt.Sprintf("$packages[\"%s\"] = (function() {\n", pkg.ImportPath)), minify)); err != nil {`
`176`	`176`	`return err`
`177`	`177`	`}`
`178`		`- vars := []string{"$pkg = {}", "$ptr = {}", "$init"}`
	`178`	`+ vars := []string{"$pkg = {}", "$init"}`
`179`	`179`	`var filteredDecls []*Decl`
`180`	`180`	`for _, d := range pkg.Declarations {`
`181`	`181`	`if d.DceObjectFilter == "" && d.DceMethodFilter == "" {`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func (c funcContext) translateExpr(expr ast.Expr) expression {`
`212`	`212`	`if c.p.escapingVars[obj] {`
`213`	`213`	`return c.formatExpr("(%1s.$ptr \|\| (%1s.$ptr = new %2s(function() { return this.$target[0]; }, function($v) { this.$target[0] = $v; }, %1s)))", c.p.objectVars[obj], c.typeName(exprType))`
`214`	`214`	`}`
`215`		`- return c.formatExpr("($ptr.%1s \|\| ($ptr.%1s = new %2s(function() { return %1s; }, function($v) { %3s })))", c.p.objectVars[obj], c.typeName(exprType), c.translateAssign(x, "$v", exprType, false))`
	`215`	+ return c.formatExpr(`(%1s \|\| (%1s = new %2s(function() { return %3s; }, function($v) { %4s })))`, c.varPtrName(obj), c.typeName(exprType), c.objectName(obj), c.translateAssign(x, "$v", exprType, false))
`216`	`216`	`case *ast.SelectorExpr:`
`217`	`217`	`newSel := &ast.SelectorExpr{X: c.newIdent("this.$target", c.p.Types[x.X].Type), Sel: x.Sel}`
`218`	`218`	`c.p.Selections[newSel] = c.p.Selections[x]`
Original file line number	Diff line number	Diff line change
`@@ -278,8 +278,8 @@ func (c *funcContext) objectName(o types.Object) string {`
`278`	`278`	`}`
`279`	`279`	`}`
`280`	`280`
`281`		`- name, found := c.p.objectVars[o]`
`282`		`- if !found {`
	`281`	`+ name, ok := c.p.objectVars[o]`
	`282`	`+ if !ok {`
`283`	`283`	`name = c.newVariableWithLevel(o.Name(), o.Parent() == c.p.Pkg.Scope())`
`284`	`284`	`c.p.objectVars[o] = name`
`285`	`285`	`}`
`@@ -290,6 +290,15 @@ func (c *funcContext) objectName(o types.Object) string {`
`290`	`290`	`return name`
`291`	`291`	`}`
`292`	`292`
	`293`	`+func (c *funcContext) varPtrName(o types.Object) string {`
	`294`	`+ name, ok := c.p.varPtrNames[o]`
	`295`	`+ if !ok {`
	`296`	`+ name = c.newVariableWithLevel(o.Name()+"$ptr", o.Parent() == c.p.Pkg.Scope())`
	`297`	`+ c.p.varPtrNames[o] = name`
	`298`	`+ }`
	`299`	`+ return name`
	`300`	`+}`
	`301`	`+`
`293`	`302`	`func (c *funcContext) typeName(ty types.Type) string {`
`294`	`303`	`switch t := ty.(type) {`
`295`	`304`	`case *types.Basic:`