close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go.tools/oracle: fix oracle tests (fix build partly) 

R=adonovan
CC=golang-dev
https://golang.org/cl/13722049
This commit is contained in:
Robert Griesemer 2013-09-18 11:32:18 -07:00
parent a68deb25ff
commit 0e06e5845b
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oracle/testdata/src/main/describe-json.go vendored
View File

@ -9,6 +9,7 @@ package describe // @describe pkgdecl "describe"
func main() { // func main() { //
var s struct{ x [3]int } var s struct{ x [3]int }
p := &s.x[0] // @describe desc-val-p "p" p := &s.x[0] // @describe desc-val-p "p"
_ = p
var i I = C(0) var i I = C(0)
if i == nil { if i == nil {

38
oracle/testdata/src/main/describe-json.golden vendored
View File

@ -11,36 +11,36 @@
{ {
"name": "C", "name": "C",
"type": "int", "type": "int",
"pos": "testdata/src/main/describe-json.go:26:6", "pos": "testdata/src/main/describe-json.go:27:6",
"kind": "type", "kind": "type",
"methods": [ "methods": [
{ {
"name": "method (describe.C) f()", "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", "name": "D",
"type": "struct{}", "type": "struct{}",
"pos": "testdata/src/main/describe-json.go:27:6", "pos": "testdata/src/main/describe-json.go:28:6",
"kind": "type", "kind": "type",
"methods": [ "methods": [
{ {
"name": "method (*describe.D) f()", "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", "name": "I",
"type": "interface{f()}", "type": "interface{f()}",
"pos": "testdata/src/main/describe-json.go:22:6", "pos": "testdata/src/main/describe-json.go:23:6",
"kind": "type", "kind": "type",
"methods": [ "methods": [
{ {
"name": "method (describe.I) f()", "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": [ "implements": [
{ {
"i": "describe.I", "i": "describe.I",
"ipos": "testdata/src/main/describe-json.go:22:6", "ipos": "testdata/src/main/describe-json.go:23:6",
"c": "describe.C", "c": "describe.C",
"cpos": "testdata/src/main/describe-json.go:26:6" "cpos": "testdata/src/main/describe-json.go:27:6"
}, },
{ {
"i": "describe.I", "i": "describe.I",
"ipos": "testdata/src/main/describe-json.go:22:6", "ipos": "testdata/src/main/describe-json.go:23:6",
"c": "*describe.D", "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 -------- }-------- @describe desc-val-p --------
@ -98,25 +98,25 @@
"mode": "describe", "mode": "describe",
"describe": { "describe": {
"desc": "identifier", "desc": "identifier",
"pos": "testdata/src/main/describe-json.go:17:6", "pos": "testdata/src/main/describe-json.go:18:6",
"detail": "value", "detail": "value",
"value": { "value": {
"type": "describe.I", "type": "describe.I",
"objpos": "testdata/src/main/describe-json.go:13:6", "objpos": "testdata/src/main/describe-json.go:14:6",
"pts": [ "pts": [
{ {
"type": "*describe.D", "type": "*describe.D",
"namepos": "testdata/src/main/describe-json.go:27:6", "namepos": "testdata/src/main/describe-json.go:28:6",
"labels": [ "labels": [
{ {
"pos": "testdata/src/main/describe-json.go:15:10", "pos": "testdata/src/main/describe-json.go:16:10",
"desc": "new" "desc": "new"
} }
] ]
}, },
{ {
"type": "describe.C", "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", "mode": "describe",
"describe": { "describe": {
"desc": "go statement", "desc": "go statement",
"pos": "testdata/src/main/describe-json.go:19:2", "pos": "testdata/src/main/describe-json.go:20:2",
"detail": "unknown" "detail": "unknown"
} }
}-------- @describe desc-type-C -------- }-------- @describe desc-type-C --------
@ -134,16 +134,16 @@
"mode": "describe", "mode": "describe",
"describe": { "describe": {
"desc": "definition of type describe.C", "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", "detail": "type",
"type": { "type": {
"type": "describe.C", "type": "describe.C",
"namepos": "testdata/src/main/describe-json.go:26:6", "namepos": "testdata/src/main/describe-json.go:27:6",
"namedef": "int", "namedef": "int",
"methods": [ "methods": [
{ {
"name": "method (describe.C) f()", "name": "method (describe.C) f()",
"pos": "testdata/src/main/describe-json.go:29:12" "pos": "testdata/src/main/describe-json.go:30:12"
} }
] ]
} }

2
oracle/testdata/src/main/describe.go vendored
View File

@ -53,6 +53,7 @@ func main() { // @describe func-def-main "main"
// type objects // type objects
type T int // @describe type-def-T "T" type T int // @describe type-def-T "T"
var three T = 3 // @describe type-ref-T "T" var three T = 3 // @describe type-ref-T "T"
_ = three
print(1 + 2*3) // @describe const-expr " 2.3" print(1 + 2*3) // @describe const-expr " 2.3"
print(real(1+2i) - 3) // @describe const-expr2 "real.*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" var a int // @describe var-decl-stmt "var a int"
// Pointer analysis can't run on dead code. // Pointer analysis can't run on dead code.
var b = &a // @describe b "b" var b = &a // @describe b "b"
_ = b
} }
type I interface { // @describe def-iface-I "I" type I interface { // @describe def-iface-I "I"