qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 17:07:09 -07:00
Code Releases Activity

cmd/compile/internal/types2: better error message for index syntax error (follow-up)

Browse Source 
For #47704.

Change-Id: I09e6f638df0cd456a20a3b68ab55c47bb5b1f555
Reviewed-on: https://go-review.googlesource.com/c/go/+/342370
Trust: Robert Griesemer <gri@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Robert Griesemer 2021-08-15 12:34:59 -07:00
parent 6ed9463133
commit 717894cf80
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/compile/internal/syntax/parser.go
View File

@ -1049,10 +1049,15 @@ loop:
} }
// x[i:... // x[i:...
// For better error message, don't use p.want(_Colon) here (issue #47704). // For better error message, don't simply use p.want(_Colon) here (issue #47704).
if !p.got(_Colon) { if !p.got(_Colon) {
if p.mode&AllowGenerics == 0 {
p.syntaxError("expecting : or ]") p.syntaxError("expecting : or ]")
p.advance(_Colon, _Rbrack) p.advance(_Colon, _Rbrack)
} else {
p.syntaxError("expecting comma, : or ]")
p.advance(_Comma, _Colon, _Rbrack)
}
} }
p.xnest++ p.xnest++
t := new(SliceExpr) t := new(SliceExpr)

18
src/cmd/compile/internal/syntax/testdata/issue47704.go2 vendored Normal file
View File

@ -0,0 +1,18 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package p
// error messages for parser in generic mode
func _() {
_ = m[] // ERROR expecting operand
_ = m[x,]
_ = m[x /* ERROR unexpected a */ a b c d]
}
// test case from the issue
func f(m map[int]int) int {
return m[0 // ERROR expecting comma, \: or \]
]
}