diff --git a/oracle/testdata/src/main/describe-json.go b/oracle/testdata/src/main/describe-json.go index 7e4220e1..56c29321 100644 --- a/oracle/testdata/src/main/describe-json.go +++ b/oracle/testdata/src/main/describe-json.go @@ -9,6 +9,7 @@ package describe // @describe pkgdecl "describe" func main() { // var s struct{ x [3]int } p := &s.x[0] // @describe desc-val-p "p" + _ = p var i I = C(0) if i == nil { diff --git a/oracle/testdata/src/main/describe-json.golden b/oracle/testdata/src/main/describe-json.golden index a9050881..e2b26182 100644 --- a/oracle/testdata/src/main/describe-json.golden +++ b/oracle/testdata/src/main/describe-json.golden @@ -11,36 +11,36 @@ { "name": "C", "type": "int", - "pos": "testdata/src/main/describe-json.go:26:6", + "pos": "testdata/src/main/describe-json.go:27:6", "kind": "type", "methods": [ { "name": "method (describe.C) f()", - "pos": "testdata/src/main/describe-json.go:29:12" + "pos": "testdata/src/main/describe-json.go:30:12" } ] }, { "name": "D", "type": "struct{}", - "pos": "testdata/src/main/describe-json.go:27:6", + "pos": "testdata/src/main/describe-json.go:28:6", "kind": "type", "methods": [ { "name": "method (*describe.D) f()", - "pos": "testdata/src/main/describe-json.go:30:13" + "pos": "testdata/src/main/describe-json.go:31:13" } ] }, { "name": "I", "type": "interface{f()}", - "pos": "testdata/src/main/describe-json.go:22:6", + "pos": "testdata/src/main/describe-json.go:23:6", "kind": "type", "methods": [ { "name": "method (describe.I) f()", - "pos": "testdata/src/main/describe-json.go:23:2" + "pos": "testdata/src/main/describe-json.go:24:2" } ] }, @@ -59,15 +59,15 @@ "implements": [ { "i": "describe.I", - "ipos": "testdata/src/main/describe-json.go:22:6", + "ipos": "testdata/src/main/describe-json.go:23:6", "c": "describe.C", - "cpos": "testdata/src/main/describe-json.go:26:6" + "cpos": "testdata/src/main/describe-json.go:27:6" }, { "i": "describe.I", - "ipos": "testdata/src/main/describe-json.go:22:6", + "ipos": "testdata/src/main/describe-json.go:23:6", "c": "*describe.D", - "cpos": "testdata/src/main/describe-json.go:27:6" + "cpos": "testdata/src/main/describe-json.go:28:6" } ] }-------- @describe desc-val-p -------- @@ -98,25 +98,25 @@ "mode": "describe", "describe": { "desc": "identifier", - "pos": "testdata/src/main/describe-json.go:17:6", + "pos": "testdata/src/main/describe-json.go:18:6", "detail": "value", "value": { "type": "describe.I", - "objpos": "testdata/src/main/describe-json.go:13:6", + "objpos": "testdata/src/main/describe-json.go:14:6", "pts": [ { "type": "*describe.D", - "namepos": "testdata/src/main/describe-json.go:27:6", + "namepos": "testdata/src/main/describe-json.go:28:6", "labels": [ { - "pos": "testdata/src/main/describe-json.go:15:10", + "pos": "testdata/src/main/describe-json.go:16:10", "desc": "new" } ] }, { "type": "describe.C", - "namepos": "testdata/src/main/describe-json.go:26:6" + "namepos": "testdata/src/main/describe-json.go:27:6" } ] } @@ -126,7 +126,7 @@ "mode": "describe", "describe": { "desc": "go statement", - "pos": "testdata/src/main/describe-json.go:19:2", + "pos": "testdata/src/main/describe-json.go:20:2", "detail": "unknown" } }-------- @describe desc-type-C -------- @@ -134,16 +134,16 @@ "mode": "describe", "describe": { "desc": "definition of type describe.C", - "pos": "testdata/src/main/describe-json.go:26:6", + "pos": "testdata/src/main/describe-json.go:27:6", "detail": "type", "type": { "type": "describe.C", - "namepos": "testdata/src/main/describe-json.go:26:6", + "namepos": "testdata/src/main/describe-json.go:27:6", "namedef": "int", "methods": [ { "name": "method (describe.C) f()", - "pos": "testdata/src/main/describe-json.go:29:12" + "pos": "testdata/src/main/describe-json.go:30:12" } ] } diff --git a/oracle/testdata/src/main/describe.go b/oracle/testdata/src/main/describe.go index 7d3c407f..b7fe77ad 100644 --- a/oracle/testdata/src/main/describe.go +++ b/oracle/testdata/src/main/describe.go @@ -53,6 +53,7 @@ func main() { // @describe func-def-main "main" // type objects type T int // @describe type-def-T "T" var three T = 3 // @describe type-ref-T "T" + _ = three print(1 + 2*3) // @describe const-expr " 2.3" print(real(1+2i) - 3) // @describe const-expr2 "real.*3" @@ -70,6 +71,7 @@ func deadcode() { var a int // @describe var-decl-stmt "var a int" // Pointer analysis can't run on dead code. var b = &a // @describe b "b" + _ = b } type I interface { // @describe def-iface-I "I"