first step towards reuse of pointers

neelance · neelance · commit df432fe6c4c4 · 2015-03-01T15:18:29.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 = {}"}
+	vars := []string{"$pkg = {}", "$ptr = {}"}
 	var filteredDecls []*Decl
 	for _, d := range pkg.Declarations {
 		if d.DceObjectFilter == "" && d.DceMethodFilter == "" {
diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -208,10 +208,11 @@ func (c *funcContext) translateExpr(expr ast.Expr) *expression {
 			case *ast.CompositeLit:
 				return c.formatExpr("$newDataPointer(%e, %s)", x, c.typeName(c.p.Types[e].Type))
 			case *ast.Ident:
-				if obj, _ := c.p.Uses[x].(*types.Var); c.p.escapingVars[obj] {
+				obj := c.p.Uses[x].(*types.Var)
+				if c.p.escapingVars[obj] {
 					return c.formatExpr("new %s(function() { return this.$target[0]; }, function($v) { this.$target[0] = $v; }, %s)", c.typeName(exprType), c.p.objectVars[obj])
 				}
-				return c.formatExpr("new %s(function() { return %e; }, function($v) { %s })", c.typeName(exprType), x, c.translateAssign(x, "$v", exprType, false))
+				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))
 			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
@@ -610,6 +610,7 @@ func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcCo
 		parent:      outerContext,
 		sig:         sig,
 		allVars:     make(map[string]int, len(outerContext.allVars)),
+		localVars:   []string{"$ptr = {}"},
 		flowDatas:   map[*types.Label]*flowData{nil: &flowData{}},
 		caseCounter: 1,
 		labelCases:  make(map[*types.Label]int),
@@ -634,7 +635,7 @@ func translateFunction(typ *ast.FuncType, stmts []ast.Stmt, outerContext *funcCo
 	}
 
 	if len(c.Flattened) != 0 {
-		c.localVars = []string{"$this = this"}
+		c.localVars = append(c.localVars, "$this = this")
 	}
 
 	body := c.CatchOutput(1, func() {
diff --git a/tests/misc_test.go b/tests/misc_test.go
@@ -18,6 +18,18 @@ func TestPointerEquality(t *testing.T) {
 	if &a[0] != &a[0] || &a[:][0] != &a[0] || &a[:][0] != &a[:][0] {
 		t.Fail()
 	}
+
+	b := 1
+	c := 1
+	if &b != &b || &b == &c {
+		t.Fail()
+	}
+	m := make(map[*int]int)
+	m[&b] = 2
+	m[&c] = 3
+	if m[&b] != 2 || m[&c] != 3 {
+		t.Fail()
+	}
 }
 
 type SingleValue struct {

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 = {}"}`
	`178`	`+ vars := []string{"$pkg = {}", "$ptr = {}"}`
`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
`@@ -610,6 +610,7 @@ func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcCo`
`610`	`610`	`parent: outerContext,`
`611`	`611`	`sig: sig,`
`612`	`612`	`allVars: make(map[string]int, len(outerContext.allVars)),`
	`613`	`+ localVars: []string{"$ptr = {}"},`
`613`	`614`	`flowDatas: map[types.Label]flowData{nil: &flowData{}},`
`614`	`615`	`caseCounter: 1,`
`615`	`616`	`labelCases: make(map[*types.Label]int),`
`@@ -634,7 +635,7 @@ func translateFunction(typ ast.FuncType, stmts []ast.Stmt, outerContext funcCo`
`634`	`635`	`}`
`635`	`636`
`636`	`637`	`if len(c.Flattened) != 0 {`
`637`		`- c.localVars = []string{"$this = this"}`
	`638`	`+ c.localVars = append(c.localVars, "$this = this")`
`638`	`639`	`}`
`639`	`640`
`640`	`641`	`body := c.CatchOutput(1, func() {`