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

cmd/compile/internal/types: separate printing of structs and tuples

Browse Source 
This CL changes the pretty printer to not rely on parameter lists
being represented as TSTRUCTs.

Change-Id: Ie2b8192ee07b96ffbe224e5d98a335368f47abc2
Reviewed-on: https://go-review.googlesource.com/c/go/+/521316
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Matthew Dempsky 2023-08-20 14:10:38 -07:00
parent 98195ed057
commit 6f7caf8894
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/cmd/compile/internal/types/fmt.go
View File

@ -483,12 +483,12 @@ func tconv2(b *bytes.Buffer, t *Type, verb rune, mode fmtMode, visited map[*Type
} else {
if t.Recv() != nil {
b.WriteString("method")
tconv2(b, t.recvsTuple(), 0, mode, visited)
formatParams(b, t.Recvs(), mode, visited)
b.WriteByte(' ')
}
b.WriteString("func")
}
tconv2(b, t.paramsTuple(), 0, mode, visited)
formatParams(b, t.Params(), mode, visited)
switch t.NumResults() {
case 0:
@ -500,7 +500,7 @@ func tconv2(b *bytes.Buffer, t *Type, verb rune, mode fmtMode, visited map[*Type
default:
b.WriteByte(' ')
tconv2(b, t.ResultsTuple(), 0, mode, visited)
formatParams(b, t.Results(), mode, visited)
}
case TSTRUCT:
@ -520,35 +520,18 @@ func tconv2(b *bytes.Buffer, t *Type, verb rune, mode fmtMode, visited map[*Type
break
}
if t.StructType().ParamTuple {
b.WriteByte('(')
fieldVerb := 'v'
switch mode {
case fmtTypeID, fmtTypeIDName, fmtGo:
// no argument names on function signature, and no "noescape"/"nosplit" tags
fieldVerb = 'S'
b.WriteString("struct {")
for i, f := range t.Fields() {
if i != 0 {
b.WriteByte(';')
}
for i, f := range t.Fields() {
if i != 0 {
b.WriteString(", ")
}
fldconv(b, f, fieldVerb, mode, visited, true)
}
b.WriteByte(')')
} else {
b.WriteString("struct {")
for i, f := range t.Fields() {
if i != 0 {
b.WriteByte(';')
}
b.WriteByte(' ')
fldconv(b, f, 'L', mode, visited, false)
}
if t.NumFields() != 0 {
b.WriteByte(' ')
}
b.WriteByte('}')
b.WriteByte(' ')
fldconv(b, f, 'L', mode, visited, false)
}
if t.NumFields() != 0 {
b.WriteByte(' ')
}
b.WriteByte('}')
case TFORW:
b.WriteString("undefined")
@ -573,6 +556,23 @@ func tconv2(b *bytes.Buffer, t *Type, verb rune, mode fmtMode, visited map[*Type
}
}
func formatParams(b *bytes.Buffer, params []*Field, mode fmtMode, visited map[*Type]int) {
b.WriteByte('(')
fieldVerb := 'v'
switch mode {
case fmtTypeID, fmtTypeIDName, fmtGo:
// no argument names on function signature, and no "noescape"/"nosplit" tags
fieldVerb = 'S'
}
for i, param := range params {
if i != 0 {
b.WriteString(", ")
}
fldconv(b, param, fieldVerb, mode, visited, true)
}
b.WriteByte(')')
}
func fldconv(b *bytes.Buffer, f *Field, verb rune, mode fmtMode, visited map[*Type]int, isParam bool) {
if f == nil {
b.WriteString("<T>")