Moved slice methods to toplevel and got rid of Go$copyFields.

Author: neelance

src/angularjs/angularjs.go

@@ -3,7 +3,7 @@ package angularjs
 func NewModule(name string, requires []string, configFn func()) *Module { return nil }
 
 const js_NewModule = `
-	requires = requires ? requires.Go$toArray() : [];
+	requires = requires ? Go$sliceToArray(requires) : [];
 	return new Module(angular.module(name, requires, configFn));
 `
 
@@ -66,7 +66,7 @@ const js_Scope_Set = `
 		this.native[key] = Go$externalizeString(value.v);
 		break;
 	case Go$Slice:
-		this.native[key] = value.Go$toArray();
+		this.native[key] = Go$sliceToArray(value);
 		break;
 	default:
 		this.native[key] = value.v !== undefined ? value.v : value;

src/gopherjs/translator/expressions.go

@@ -433,22 +433,24 @@ func (c *PkgContext) translateExpr(expr ast.Expr) string {
 	case *ast.SliceExpr:
 		b, isBasic := c.info.Types[e.X].(*types.Basic)
 		isString := isBasic && b.Info()&types.IsString != 0
-		method := "Go$subslice"
-		if isString {
-			method = "substring"
-		}
 		slice := c.translateExprToType(e.X, exprType)
 		if e.High == nil {
 			if e.Low == nil {
 				return slice
 			}
-			return fmt.Sprintf("%s.%s(%s)", slice, method, c.translateExpr(e.Low))
+			if isString {
+				return fmt.Sprintf("%s.substring(%s)", slice, c.translateExpr(e.Low))
+			}
+			return fmt.Sprintf("Go$subslice(%s, %s)", slice, c.translateExpr(e.Low))
 		}
 		low := "0"
 		if e.Low != nil {
 			low = c.translateExpr(e.Low)
 		}
-		return fmt.Sprintf("%s.%s(%s, %s)", slice, method, low, c.translateExpr(e.High))
+		if isString {
+			return fmt.Sprintf("%s.substring(%s, %s)", slice, low, c.translateExpr(e.High))
+		}
+		return fmt.Sprintf("Go$subslice(%s, %s, %s)", slice, low, c.translateExpr(e.High))
 
 	case *ast.SelectorExpr:
 		sel := c.info.Selections[e]
@@ -498,7 +500,7 @@ func (c *PkgContext) translateExpr(expr ast.Expr) string {
 					switch t2 := c.info.Types[e.Args[0]].Underlying().(type) {
 					case *types.Slice:
 						if len(e.Args) == 3 {
-							return fmt.Sprintf("new %s(Go$clear(new %s(%s))).Go$subslice(0, %s)", c.typeName(c.info.Types[e.Args[0]]), toArrayType(t2.Elem()), c.translateExpr(e.Args[2]), c.translateExpr(e.Args[1]))
+							return fmt.Sprintf("Go$subslice(new %s(Go$clear(new %s(%s))), 0, %s)", c.typeName(c.info.Types[e.Args[0]]), toArrayType(t2.Elem()), c.translateExpr(e.Args[2]), c.translateExpr(e.Args[1]))
 						}
 						return fmt.Sprintf("new %s(Go$clear(new %s(%s)))", c.typeName(c.info.Types[e.Args[0]]), toArrayType(t2.Elem()), c.translateExpr(e.Args[1]))
 					default:
@@ -749,7 +751,7 @@ func (c *PkgContext) translateExprToType(expr ast.Expr, desiredType types.Type)
 		case t.Kind() == types.UnsafePointer:
 			if unary, isUnary := expr.(*ast.UnaryExpr); isUnary && unary.Op == token.AND {
 				if indexExpr, isIndexExpr := unary.X.(*ast.IndexExpr); isIndexExpr {
-					return fmt.Sprintf("%s.Go$toArray()", c.translateExprToType(indexExpr.X, types.NewSlice(nil)))
+					return fmt.Sprintf("Go$sliceToArray(%s)", c.translateExprToType(indexExpr.X, types.NewSlice(nil)))
 				}
 				if ident, isIdent := unary.X.(*ast.Ident); isIdent && ident.Name == "_zero" {
 					return "new Uint8Array(0)"
@@ -783,7 +785,7 @@ func (c *PkgContext) translateExprToType(expr ast.Expr, desiredType types.Type)
 		}
 		_, desiredIsNamed := desiredType.(*types.Named)
 		if desiredIsNamed && !types.IsIdentical(exprType, desiredType) {
-			return fmt.Sprintf("(Go$obj = %s, (new %s(Go$obj.array)).Go$subslice(Go$obj.offset, Go$obj.offset + Go$obj.length))", c.translateExpr(expr), c.typeName(desiredType))
+			return fmt.Sprintf("(Go$obj = %s, Go$subslice(new %s(Go$obj.array), Go$obj.offset, Go$obj.offset + Go$obj.length))", c.translateExpr(expr), c.typeName(desiredType))
 		}
 		return c.translateExpr(expr)
 

src/gopherjs/translator/natives.go

@@ -10,14 +10,6 @@ var Go$keys = Object.keys;
 var Go$min = Math.min;
 var Go$charToString = String.fromCharCode;
 
-var Go$copyFields = function(from, to) {
-	var keys = Object.keys(from);
-	for (var i = 0; i < keys.length; i++) {
-		var key = keys[i];
-		to[key] = from[key];
-	}
-};
-
 var Go$Uint8      = function(v) { this.v = v; };
 Go$Uint8.prototype.Go$key = function() { return "Uint8$" + this.v; };
 var Go$Uint16     = function(v) { this.v = v; };
@@ -185,23 +177,25 @@ var Go$Slice = function(array) {
 	this.length = array && array.length;
 };
 Go$Slice.Go$nil = new Go$Slice({ isNil: true, length: 0 });
-Go$Slice.prototype.Go$subslice = function(begin, end) {
-	var s = new this.constructor(this.array);
-	s.offset = this.offset + begin;
-	s.length = this.length - begin;
+
+var Go$subslice = function(slice, begin, end) {
+	var s = new slice.constructor(slice.array);
+	s.offset = slice.offset + begin;
+	s.length = slice.length - begin;
 	if (end !== undefined) {
 		s.length = end - begin;
 	}
 	return s;
 };
-Go$Slice.prototype.Go$toArray = function() {
-	if (this.length === 0) {
+
+var Go$sliceToArray = function(slice) {
+	if (slice.length === 0) {
 		return [];
 	}
-	if (this.array.constructor !== Array) {
-		return this.array.subarray(this.offset, this.offset + this.length);
+	if (slice.array.constructor !== Array) {
+		return slice.array.subarray(slice.offset, slice.offset + slice.length);
 	}
-	return this.array.slice(this.offset, this.offset + this.length);
+	return slice.array.slice(slice.offset, slice.offset + slice.length);
 };
 
 var Go$decodeRune = function(str, pos) {

src/gopherjs/translator/package.go

@@ -399,7 +399,6 @@ func (c *PkgContext) translateSpec(spec ast.Spec) {
 		default:
 			underlyingTypeName := c.typeName(t)
 			c.Printf("%s = function() { %s.apply(this, arguments); };", typeName, underlyingTypeName)
-			c.Printf("Go$copyFields(%s.prototype, %s.prototype);", underlyingTypeName, typeName)
 			c.Printf("%s.Go$Pointer = function(getter, setter) { this.Go$get = getter; this.Go$set = setter; };", typeName)
 			if _, isSlice := t.(*types.Slice); isSlice {
 				c.Printf("%s.Go$nil = new %s({ isNil: true, length: 0 });", typeName, typeName)