cmd/api: work on Windows again, and make gccgo files work a bit more

bradfitz · bradfitz · commit e31fa68a43d7 · 2012-03-11T17:55:15.000-07:00
handle string and []byte conversions. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/5754082
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
@@ -579,7 +579,14 @@ func (w *Walker) varValueType(vi interface{}) (string, error) {
 			}
 		}
 		// maybe a function call; maybe a conversion.  Need to lookup type.
-		return "", fmt.Errorf("not a known function %q", w.nodeString(v.Fun))
+		// TODO(bradfitz): this is a hack, but arguably most of this tool is,
+		// until the Go AST has type information.
+		nodeStr := w.nodeString(v.Fun)
+		switch nodeStr {
+		case "string", "[]byte":
+			return nodeStr, nil
+		}
+		return "", fmt.Errorf("not a known function %q", nodeStr)
 	default:
 		return "", fmt.Errorf("unknown const value type %T", vi)
 	}
diff --git a/src/cmd/api/testdata/src/pkg/p1/golden.txt b/src/cmd/api/testdata/src/pkg/p1/golden.txt
@@ -58,14 +58,16 @@ pkg p1, type T struct
 pkg p1, type TPtrExported struct
 pkg p1, type TPtrExported struct, embedded *Embedded
 pkg p1, type TPtrUnexported struct
+pkg p1, var ByteConv []byte
 pkg p1, var ChecksumError error
 pkg p1, var SIPtr *SI
 pkg p1, var SIPtr2 *SI
 pkg p1, var SIVal SI
+pkg p1, var StrConv string
 pkg p1, var V string
-pkg p1, var VError Error
 pkg p1, var V1 uint64
 pkg p1, var V2 p2.Twoer
+pkg p1, var VError Error
 pkg p1, var X I
 pkg p1, var X int64
 pkg p1, var Y int
diff --git a/src/cmd/api/testdata/src/pkg/p1/p1.go b/src/cmd/api/testdata/src/pkg/p1/p1.go
@@ -27,6 +27,12 @@ var (
 	V2     = ptwo.G()
 )
 
+// Variables with conversions:
+var (
+	StrConv  = string("foo")
+	ByteConv = []byte("foo")
+)
+
 var ChecksumError = ptwo.NewError("gzip checksum error")
 
 const B = 2

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,14 @@ func (w *Walker) varValueType(vi interface{}) (string, error) {`
`579`	`579`	`}`
`580`	`580`	`}`
`581`	`581`	`// maybe a function call; maybe a conversion. Need to lookup type.`
`582`		`- return "", fmt.Errorf("not a known function %q", w.nodeString(v.Fun))`
	`582`	`+ // TODO(bradfitz): this is a hack, but arguably most of this tool is,`
	`583`	`+ // until the Go AST has type information.`
	`584`	`+ nodeStr := w.nodeString(v.Fun)`
	`585`	`+ switch nodeStr {`
	`586`	`+ case "string", "[]byte":`
	`587`	`+ return nodeStr, nil`
	`588`	`+ }`
	`589`	`+ return "", fmt.Errorf("not a known function %q", nodeStr)`
`583`	`590`	`default:`
`584`	`591`	`return "", fmt.Errorf("unknown const value type %T", vi)`
`585`	`592`	`}`