fixed pointer conversion of basic types

neelance · neelance · commit 117c7d9eb71e · 2015-03-26T16:07:11.000+01:00
diff --git a/compiler/expressions.go b/compiler/expressions.go
@@ -1015,7 +1015,11 @@ func (c *funcContext) translateConversion(expr ast.Expr, desiredType types.Type)
 		}
 
 		if !types.Identical(exprType, types.Typ[types.UnsafePointer]) {
-			return c.formatExpr("new %1s(%2e.$get, %2e.$set, %2e.$target)", c.typeName(desiredType), expr)
+			exprTypeElem := exprType.Underlying().(*types.Pointer).Elem()
+			ptrVar := c.newVariable("_ptr")
+			getterConv := c.translateConversion(c.setType(&ast.StarExpr{X: c.newIdent(ptrVar, exprType)}, exprTypeElem), t.Elem())
+			setterConv := c.translateConversion(c.newIdent("$v", t.Elem()), exprTypeElem)
+			return c.formatExpr("(%1s = %2e, new %3s(function() { return %4s; }, function($v) { %1s.$set(%5s); }, %1s.$target))", ptrVar, expr, c.typeName(desiredType), getterConv, setterConv)
 		}
 
 	case *types.Interface:

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,11 @@ func (c *funcContext) translateConversion(expr ast.Expr, desiredType types.Type)`
`1015`	`1015`	`}`
`1016`	`1016`
`1017`	`1017`	`if !types.Identical(exprType, types.Typ[types.UnsafePointer]) {`
`1018`		`- return c.formatExpr("new %1s(%2e.$get, %2e.$set, %2e.$target)", c.typeName(desiredType), expr)`
	`1018`	`+ exprTypeElem := exprType.Underlying().(*types.Pointer).Elem()`
	`1019`	`+ ptrVar := c.newVariable("_ptr")`
	`1020`	`+ getterConv := c.translateConversion(c.setType(&ast.StarExpr{X: c.newIdent(ptrVar, exprType)}, exprTypeElem), t.Elem())`
	`1021`	`+ setterConv := c.translateConversion(c.newIdent("$v", t.Elem()), exprTypeElem)`
	`1022`	`+ return c.formatExpr("(%1s = %2e, new %3s(function() { return %4s; }, function($v) { %1s.$set(%5s); }, %1s.$target))", ptrVar, expr, c.typeName(desiredType), getterConv, setterConv)`
`1019`	`1023`	`}`
`1020`	`1024`
`1021`	`1025`	`case *types.Interface:`