WIP: Better solution for method name encoding mismatch.

dmitshur · dmitshur · commit 0cb05c522437 · 2018-01-12T17:27:30.000-05:00
diff --git a/compiler/package.go b/compiler/package.go
@@ -488,7 +488,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 						pkgPath = method.Pkg().Path()
 					}
 					t := method.Type().(*types.Signature)
-					entry := fmt.Sprintf(`{prop: "%s", name: "%s", pkg: "%s", typ: $funcType(%s)}`, name, method.Name(), pkgPath, c.initArgs(t))
+					entry := fmt.Sprintf(`{prop: "%s", name: %s, pkg: "%s", typ: $funcType(%s)}`, name, encodeString(method.Name()), pkgPath, c.initArgs(t))
 					if _, isPtr := t.Recv().Type().(*types.Pointer); isPtr {
 						ptrMethods = append(ptrMethods, entry)
 						continue
@@ -589,7 +589,7 @@ func (c *funcContext) initArgs(ty types.Type) string {
 			if !field.Exported() {
 				pkgPath = field.Pkg().Path()
 			}
-			fields[i] = fmt.Sprintf(`{prop: "%s", name: "%s", anonymous: %t, exported: %t, typ: %s, tag: %s}`, fieldName(t, i), field.Name(), field.Anonymous(), field.Exported(), c.typeName(field.Type()), encodeString(t.Tag(i)))
+			fields[i] = fmt.Sprintf(`{prop: "%s", name: %s, anonymous: %t, exported: %t, typ: %s, tag: %s}`, fieldName(t, i), encodeString(field.Name()), field.Anonymous(), field.Exported(), c.typeName(field.Type()), encodeString(t.Tag(i)))
 		}
 		return fmt.Sprintf(`"%s", [%s]`, pkgPath, strings.Join(fields, ", "))
 	default:
diff --git a/compiler/prelude/types.go b/compiler/prelude/types.go
@@ -454,9 +454,9 @@ var $methodSet = function(typ) {
 
   typ.methodSetCache = [];
   var x = Object.keys(base).sort();
-  if (x.length === 2 && x[0] === "nonexported" && x[1] === "ΦExported") {
+  if (x.length === 2 && x[0] === "nonexported" && x[1] === "\xCE\xA6Exported") {
     /* HACK: Hacky fix for TestIssue22073. Need to find a good general fix. */
-    x[0] = "ΦExported";
+    x[0] = "\xCE\xA6Exported";
     x[1] = "nonexported";
   }
   x.forEach(function(name) {

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ func Compile(importPath string, files []ast.File, fileSet token.FileSet, impor`
`488`	`488`	`pkgPath = method.Pkg().Path()`
`489`	`489`	`}`
`490`	`490`	`t := method.Type().(*types.Signature)`
`491`		- entry := fmt.Sprintf(`{prop: "%s", name: "%s", pkg: "%s", typ: $funcType(%s)}`, name, method.Name(), pkgPath, c.initArgs(t))
	`491`	+ entry := fmt.Sprintf(`{prop: "%s", name: %s, pkg: "%s", typ: $funcType(%s)}`, name, encodeString(method.Name()), pkgPath, c.initArgs(t))
`492`	`492`	`if _, isPtr := t.Recv().Type().(*types.Pointer); isPtr {`
`493`	`493`	`ptrMethods = append(ptrMethods, entry)`
`494`	`494`	`continue`
`@@ -589,7 +589,7 @@ func (c *funcContext) initArgs(ty types.Type) string {`
`589`	`589`	`if !field.Exported() {`
`590`	`590`	`pkgPath = field.Pkg().Path()`
`591`	`591`	`}`
`592`		- fields[i] = fmt.Sprintf(`{prop: "%s", name: "%s", anonymous: %t, exported: %t, typ: %s, tag: %s}`, fieldName(t, i), field.Name(), field.Anonymous(), field.Exported(), c.typeName(field.Type()), encodeString(t.Tag(i)))
	`592`	+ fields[i] = fmt.Sprintf(`{prop: "%s", name: %s, anonymous: %t, exported: %t, typ: %s, tag: %s}`, fieldName(t, i), encodeString(field.Name()), field.Anonymous(), field.Exported(), c.typeName(field.Type()), encodeString(t.Tag(i)))
`593`	`593`	`}`
`594`	`594`	return fmt.Sprintf(`"%s", [%s]`, pkgPath, strings.Join(fields, ", "))
`595`	`595`	`default:`