go/parser, syntax: better error message for parameter missing type

Fixes #69506.

Change-Id: I18215e11f214b12d5f65be1d1740181e427f8817
Reviewed-on: https://go-review.googlesource.com/c/go/+/617015
Reviewed-by: Alan Donovan <adonovan@google.com>
Reviewed-by: Robert Griesemer <gri@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Robert Griesemer 2024-09-30 14:10:40 -07:00 committed by Robert Griesemer
parent 0206eb9679
commit bae2e968e2
7 changed files with 54 additions and 27 deletions

View File

@ -2075,26 +2075,31 @@ func (p *parser) paramList(name *Name, typ Expr, close token, requireNames bool)
} }
} }
if errPos.IsKnown() { if errPos.IsKnown() {
// Not all parameters are named because named != len(list).
// If named == typed, there must be parameters that have no types.
// They must be at the end of the parameter list, otherwise types
// would have been filled in by the right-to-left sweep above and
// there would be no error.
// If requireNames is set, the parameter list is a type parameter
// list.
var msg string var msg string
if requireNames { if named == typed {
// Not all parameters are named because named != len(list). errPos = end // position error at closing token ) or ]
// If named == typed we must have parameters that have no types, if requireNames {
// and they must be at the end of the parameter list, otherwise
// the types would have been filled in by the right-to-left sweep
// above and we wouldn't have an error. Since we are in a type
// parameter list, the missing types are constraints.
if named == typed {
errPos = end // position error at closing ]
msg = "missing type constraint" msg = "missing type constraint"
} else { } else {
msg = "missing parameter type"
}
} else {
if requireNames {
msg = "missing type parameter name" msg = "missing type parameter name"
// go.dev/issue/60812 // go.dev/issue/60812
if len(list) == 1 { if len(list) == 1 {
msg += " or invalid array length" msg += " or invalid array length"
} }
} else {
msg = "missing parameter name"
} }
} else {
msg = "mixed named and unnamed parameters"
} }
p.syntaxErrorAt(errPos, msg) p.syntaxErrorAt(errPos, msg)
} }

View File

@ -0,0 +1,9 @@
// Copyright 2024 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
func _(a int, b /* ERROR missing parameter type */ )
func _(a int, /* ERROR missing parameter name */ []int)
func _(a int, /* ERROR missing parameter name */ []int, c int)

View File

@ -13,7 +13,7 @@ type t struct {
} }
type t interface { type t interface {
t[a] t[a]
m /* ERROR method must have no type parameters */ [_ _, /* ERROR mixed */ _]() m /* ERROR method must have no type parameters */ [_ _, _ /* ERROR missing parameter type */ ]()
t[a, b] t[a, b]
} }

View File

@ -978,26 +978,30 @@ func (p *parser) parseParameterList(name0 *ast.Ident, typ0 ast.Expr, closing tok
} }
} }
if errPos.IsValid() { if errPos.IsValid() {
// Not all parameters are named because named != len(list).
// If named == typed, there must be parameters that have no types.
// They must be at the end of the parameter list, otherwise types
// would have been filled in by the right-to-left sweep above and
// there would be no error.
// If tparams is set, the parameter list is a type parameter list.
var msg string var msg string
if tparams { if named == typed {
// Not all parameters are named because named != len(list). errPos = p.pos // position error at closing token ) or ]
// If named == typed we must have parameters that have no types, if tparams {
// and they must be at the end of the parameter list, otherwise
// the types would have been filled in by the right-to-left sweep
// above and we wouldn't have an error. Since we are in a type
// parameter list, the missing types are constraints.
if named == typed {
errPos = p.pos // position error at closing ]
msg = "missing type constraint" msg = "missing type constraint"
} else { } else {
msg = "missing parameter type"
}
} else {
if tparams {
msg = "missing type parameter name" msg = "missing type parameter name"
// go.dev/issue/60812 // go.dev/issue/60812
if len(list) == 1 { if len(list) == 1 {
msg += " or invalid array length" msg += " or invalid array length"
} }
} else {
msg = "missing parameter name"
} }
} else {
msg = "mixed named and unnamed parameters"
} }
p.error(errPos, msg) p.error(errPos, msg)
} }

9
src/go/parser/testdata/issue69506.go2 vendored Normal file
View File

@ -0,0 +1,9 @@
// Copyright 2024 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
func _(a int, b) /* ERROR "missing parameter type" */
func _(a int, [ /* ERROR "missing parameter name" */ ]int)
func _(a int, [ /* ERROR "missing parameter name" */ ]int, c int)

View File

@ -9,7 +9,7 @@
package main package main
import "runtime" import "runtime"
func foo(runtime.UintType, i int) { // ERROR "cannot declare name runtime.UintType|mixed named and unnamed|undefined identifier" func foo(runtime.UintType, i int) { // ERROR "cannot declare name runtime.UintType|missing parameter name|undefined identifier"
println(i, runtime.UintType) // GCCGO_ERROR "undefined identifier" println(i, runtime.UintType) // GCCGO_ERROR "undefined identifier"
} }

View File

@ -13,8 +13,8 @@ type t1 int
type t2 int type t2 int
type t3 int type t3 int
func f1(*t2, x t3) // ERROR "named" func f1(*t2, x t3) // ERROR "missing parameter name"
func f2(t1, *t2, x t3) // ERROR "named" func f2(t1, *t2, x t3) // ERROR "missing parameter name"
func f3() (x int, *string) // ERROR "named" func f3() (x int, *string) // ERROR "missing parameter name"
func f4() (t1 t1) // legal - scope of parameter named t1 starts in body of f4. func f4() (t1 t1) // legal - scope of parameter named t1 starts in body of f4.