summaryrefslogtreecommitdiff
path: root/src/cmd/api
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2013-09-06 12:01:01 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2013-09-06 12:01:01 -0700
commit5837c0f391aaa34877a89555717e68423f7b06b2 (patch)
treef889391ffdc38cec5941994e09a7d9037128f5de /src/cmd/api
parentbe5c1396381e0a92562def7177a0238b368349ec (diff)
downloadgo-5837c0f391aaa34877a89555717e68423f7b06b2.tar.gz
cmd/api: include constant values
Update Issue 5935 R=golang-dev, rsc, iant, dave CC=golang-dev https://codereview.appspot.com/13261050
Diffstat (limited to 'src/cmd/api')
-rw-r--r--src/cmd/api/goapi.go5
-rw-r--r--src/cmd/api/testdata/src/pkg/p1/golden.txt8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index 1138f4db0..7102e9d40 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -690,16 +690,13 @@ func (w *Walker) emitObj(obj types.Object) {
switch obj := obj.(type) {
case *types.Const:
w.emitf("const %s %s", obj.Name(), w.typeString(obj.Type()))
-
+ w.emitf("const %s = %s", obj.Name(), obj.Val())
case *types.Var:
w.emitf("var %s %s", obj.Name(), w.typeString(obj.Type()))
-
case *types.TypeName:
w.emitType(obj)
-
case *types.Func:
w.emitFunc(obj)
-
default:
panic("unknown object: " + obj.String())
}
diff --git a/src/cmd/api/testdata/src/pkg/p1/golden.txt b/src/cmd/api/testdata/src/pkg/p1/golden.txt
index 12fd452ff..3c43a226f 100644
--- a/src/cmd/api/testdata/src/pkg/p1/golden.txt
+++ b/src/cmd/api/testdata/src/pkg/p1/golden.txt
@@ -1,10 +1,18 @@
+pkg p1, const A = 1
pkg p1, const A ideal-int
+pkg p1, const A64 = 1
pkg p1, const A64 int64
+pkg p1, const AIsLowerA = 11
pkg p1, const AIsLowerA ideal-int
+pkg p1, const B0 = 2
pkg p1, const B0 ideal-int
+pkg p1, const ConstChase2 = 11
pkg p1, const ConstChase2 ideal-int
+pkg p1, const ConversionConst = 5
pkg p1, const ConversionConst MyInt
+pkg p1, const FloatConst = 3/2
pkg p1, const FloatConst ideal-float
+pkg p1, const StrConst = "foo"
pkg p1, const StrConst ideal-string
pkg p1, func Bar(int8, int16, int64)
pkg p1, func Bar1(int8, int16, int64) uint64