[dev.regabi] cmd/compile: cleanup //go:generate directives

During recent refactoring, we moved mkbuiltin.go to package typecheck,
but accidentally duplicated its //go:generate directive into a bunch
of other files/directories. This CL cleans up the unnecessary
duplicates.

Also, update all of the stringer invocations to use an explicit file
name, and regenerate their files.

Updates #43369.

Change-Id: I4e493c1fff103d742de0a839d7a3375659270b50
Reviewed-on: https://go-review.googlesource.com/c/go/+/280635
Trust: Matthew Dempsky <mdempsky@google.com>
Trust: Meng Zhuo <mzh@golangcn.org>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Meng Zhuo <mzh@golangcn.org>
This commit is contained in:
Matthew Dempsky 2020-12-28 15:40:19 -08:00
parent 07569dac4e
commit 3f370b75fb
10 changed files with 89 additions and 14 deletions

View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:generate go run mkbuiltin.go
package gc
import (

View File

@ -1,4 +1,4 @@
// Code generated by "stringer -type=Class"; DO NOT EDIT.
// Code generated by "stringer -type=Class name.go"; DO NOT EDIT.
package ir

View File

@ -373,7 +373,7 @@ func DeclaredBy(x, stmt Node) bool {
// called declaration contexts.
type Class uint8
//go:generate stringer -type=Class
//go:generate stringer -type=Class name.go
const (
Pxxx Class = iota // no class; used during ssa conversion to indicate pseudo-variables
PEXTERN // global variables

View File

@ -92,7 +92,7 @@ func MayBeShared(n Node) bool {
return false
}
//go:generate stringer -type=Op -trimprefix=O
//go:generate stringer -type=Op -trimprefix=O node.go
type Op uint8

View File

@ -1,4 +1,4 @@
// Code generated by "stringer -type=Op -trimprefix=O"; DO NOT EDIT.
// Code generated by "stringer -type=Op -trimprefix=O node.go"; DO NOT EDIT.
package ir

View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:generate go run mkbuiltin.go
package noder
import (

View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:generate go run mkbuiltin.go
package ssagen
import (

View File

@ -1,9 +1,37 @@
// Code generated by "stringer -type Operator -linecomment"; DO NOT EDIT.
// Code generated by "stringer -type Operator -linecomment tokens.go"; DO NOT EDIT.
package syntax
import "strconv"
func _() {
// An "invalid array index" compiler error signifies that the constant values have changed.
// Re-run the stringer command to generate them again.
var x [1]struct{}
_ = x[Def-1]
_ = x[Not-2]
_ = x[Recv-3]
_ = x[OrOr-4]
_ = x[AndAnd-5]
_ = x[Eql-6]
_ = x[Neq-7]
_ = x[Lss-8]
_ = x[Leq-9]
_ = x[Gtr-10]
_ = x[Geq-11]
_ = x[Add-12]
_ = x[Sub-13]
_ = x[Or-14]
_ = x[Xor-15]
_ = x[Mul-16]
_ = x[Div-17]
_ = x[Rem-18]
_ = x[And-19]
_ = x[AndNot-20]
_ = x[Shl-21]
_ = x[Shr-22]
}
const _Operator_name = ":!<-||&&==!=<<=>>=+-|^*/%&&^<<>>"
var _Operator_index = [...]uint8{0, 1, 2, 4, 6, 8, 10, 12, 13, 15, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 28, 30, 32}

View File

@ -1,9 +1,62 @@
// Code generated by "stringer -type token -linecomment"; DO NOT EDIT.
// Code generated by "stringer -type token -linecomment tokens.go"; DO NOT EDIT.
package syntax
import "strconv"
func _() {
// An "invalid array index" compiler error signifies that the constant values have changed.
// Re-run the stringer command to generate them again.
var x [1]struct{}
_ = x[_EOF-1]
_ = x[_Name-2]
_ = x[_Literal-3]
_ = x[_Operator-4]
_ = x[_AssignOp-5]
_ = x[_IncOp-6]
_ = x[_Assign-7]
_ = x[_Define-8]
_ = x[_Arrow-9]
_ = x[_Star-10]
_ = x[_Lparen-11]
_ = x[_Lbrack-12]
_ = x[_Lbrace-13]
_ = x[_Rparen-14]
_ = x[_Rbrack-15]
_ = x[_Rbrace-16]
_ = x[_Comma-17]
_ = x[_Semi-18]
_ = x[_Colon-19]
_ = x[_Dot-20]
_ = x[_DotDotDot-21]
_ = x[_Break-22]
_ = x[_Case-23]
_ = x[_Chan-24]
_ = x[_Const-25]
_ = x[_Continue-26]
_ = x[_Default-27]
_ = x[_Defer-28]
_ = x[_Else-29]
_ = x[_Fallthrough-30]
_ = x[_For-31]
_ = x[_Func-32]
_ = x[_Go-33]
_ = x[_Goto-34]
_ = x[_If-35]
_ = x[_Import-36]
_ = x[_Interface-37]
_ = x[_Map-38]
_ = x[_Package-39]
_ = x[_Range-40]
_ = x[_Return-41]
_ = x[_Select-42]
_ = x[_Struct-43]
_ = x[_Switch-44]
_ = x[_Type-45]
_ = x[_Var-46]
_ = x[tokenCount-47]
}
const _token_name = "EOFnameliteralopop=opop=:=<-*([{)]},;:....breakcasechanconstcontinuedefaultdeferelsefallthroughforfuncgogotoifimportinterfacemappackagerangereturnselectstructswitchtypevar"
var _token_index = [...]uint8{0, 3, 7, 14, 16, 19, 23, 24, 26, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 42, 47, 51, 55, 60, 68, 75, 80, 84, 95, 98, 102, 104, 108, 110, 116, 125, 128, 135, 140, 146, 152, 158, 164, 168, 171, 171}

View File

@ -6,7 +6,7 @@ package syntax
type token uint
//go:generate stringer -type token -linecomment
//go:generate stringer -type token -linecomment tokens.go
const (
_ token = iota
@ -105,7 +105,7 @@ const (
type Operator uint
//go:generate stringer -type Operator -linecomment
//go:generate stringer -type Operator -linecomment tokens.go
const (
_ Operator = iota