mirror of
https://github.com/golang/go
synced 2024-11-11 22:50:22 -07:00
go/parser: don't parse a nil IndexExpr.Index
When parsing type parameters, an empty type instantiation was parsed as an IndexExpr with nil Index. This should be considered a breaking change to parsing: ast.Walk previously assumed that Index was non-nil. Back out the nil check in ast.Walk, and for now pack an empty argument list as a non-nil ListExpr with nil Elems. Alternatives considered: - Parsing the entire index expression as a BadExpr: this led to inferior errors while type checking. - Parsing the Index as a BadExpr: this seems reasonable, but encodes strictly less information into the AST. We may want to opt for one of these alternatives in the future, but for now let's just fix the breaking change. Change-Id: I93f2b89641692ac014b8ee98bfa031ed3477afb8 Reviewed-on: https://go-review.googlesource.com/c/go/+/315851 Trust: Robert Findley <rfindley@google.com> Trust: Robert Griesemer <gri@golang.org> Run-TryBot: Robert Findley <rfindley@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
parent
15557af207
commit
cf73f1a8e4
@ -112,11 +112,7 @@ func Walk(v Visitor, node Node) {
|
||||
|
||||
case *IndexExpr:
|
||||
Walk(v, n.X)
|
||||
// n.Index may be nil for invalid type instantiation expressions, e.g.
|
||||
// var x T[].
|
||||
if n.Index != nil {
|
||||
Walk(v, n.Index)
|
||||
}
|
||||
Walk(v, n.Index)
|
||||
|
||||
case *SliceExpr:
|
||||
Walk(v, n.X)
|
||||
|
@ -15,8 +15,6 @@ const Enabled = false
|
||||
|
||||
func PackExpr(list []ast.Expr) ast.Expr {
|
||||
switch len(list) {
|
||||
case 0:
|
||||
return nil
|
||||
case 1:
|
||||
return list[0]
|
||||
default:
|
||||
|
@ -17,7 +17,10 @@ const Enabled = true
|
||||
func PackExpr(list []ast.Expr) ast.Expr {
|
||||
switch len(list) {
|
||||
case 0:
|
||||
return nil
|
||||
// Return an empty ListExpr here, rather than nil, as IndexExpr.Index must
|
||||
// never be nil.
|
||||
// TODO(rFindley) would a BadExpr be more appropriate here?
|
||||
return &ast.ListExpr{}
|
||||
case 1:
|
||||
return list[0]
|
||||
default:
|
||||
|
@ -1095,6 +1095,7 @@ func (p *parser) parseChanType() *ast.ChanType {
|
||||
}
|
||||
|
||||
func (p *parser) parseTypeInstance(typ ast.Expr) ast.Expr {
|
||||
assert(p.parseTypeParams(), "parseTypeInstance while not parsing type params")
|
||||
if p.trace {
|
||||
defer un(trace(p, "TypeInstance"))
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user