[go] go/types: use strings.Builder
8 views
Skip to first unread message
xie cui (Gerrit)
Sep 2, 2022, 6:42:44 PM9/2/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
xie cui has uploaded this change for review.
go/types: use strings.Builder
Change-Id: I68ebf95764e4355a5bcbe2f065e0c368b475d7f0
---
M src/go/types/api.go
M src/go/types/errors.go
M src/go/types/exprstring.go
3 files changed, 113 insertions(+), 104 deletions(-)
diff --git a/src/go/types/api.go b/src/go/types/api.go
index 09c9123..8b95711 100644
--- a/src/go/types/api.go
+++ b/src/go/types/api.go
@@ -26,11 +26,11 @@
package types
import (
- "bytes"
"fmt"
"go/ast"
"go/constant"
"go/token"
+ "strings"
)
// An Error describes a type-checking error; it implements the error interface.
@@ -383,16 +383,16 @@
}
func (init *Initializer) String() string {
- var buf bytes.Buffer
+ var sb strings.Builder
for i, lhs := range init.Lhs {
if i > 0 {
- buf.WriteString(", ")
+ sb.WriteString(", ")
}
- buf.WriteString(lhs.Name())
+ sb.WriteString(lhs.Name())
}
- buf.WriteString(" = ")
- WriteExpr(&buf, init.Rhs)
- return buf.String()
+ sb.WriteString(" = ")
+ WriteExpr(&sb, init.Rhs)
+ return sb.String()
}
// Check type-checks a package and returns the resulting package object and
diff --git a/src/go/types/errors.go b/src/go/types/errors.go
index 964f377..423c29e 100644
--- a/src/go/types/errors.go
+++ b/src/go/types/errors.go
@@ -154,11 +154,11 @@
case ast.Expr:
arg = ExprString(a)
case []ast.Expr:
- var buf bytes.Buffer
- buf.WriteByte('[')
- writeExprList(&buf, a)
- buf.WriteByte(']')
- arg = buf.String()
+ var sb strings.Builder
+ sb.WriteByte('[')
+ writeExprList(&sb, a)
+ sb.WriteByte(']')
+ arg = sb.String()
case Object:
arg = ObjectString(a, qf)
case Type:
diff --git a/src/go/types/exprstring.go b/src/go/types/exprstring.go
index e19d79d..9500057 100644
--- a/src/go/types/exprstring.go
+++ b/src/go/types/exprstring.go
@@ -7,25 +7,25 @@
package types
import (
- "bytes"
"fmt"
"go/ast"
"go/internal/typeparams"
+ "strings"
)
// ExprString returns the (possibly shortened) string representation for x.
// Shortened representations are suitable for user interfaces but may not
// necessarily follow Go syntax.
func ExprString(x ast.Expr) string {
- var buf bytes.Buffer
- WriteExpr(&buf, x)
- return buf.String()
+ var sb strings.Builder
+ WriteExpr(&sb, x)
+ return sb.String()
}
// WriteExpr writes the (possibly shortened) string representation for x to buf.
// Shortened representations are suitable for user interfaces but may not
// necessarily follow Go syntax.
-func WriteExpr(buf *bytes.Buffer, x ast.Expr) {
+func WriteExpr(sb *strings.Builder, x ast.Expr) {
// The AST preserves source-level parentheses so there is
// no need to introduce them here to correct for different
// operator precedences. (This assumes that the AST was
@@ -33,125 +33,125 @@
switch x := x.(type) {
default:
- buf.WriteString(fmt.Sprintf("(ast: %T)", x)) // nil, ast.BadExpr, ast.KeyValueExpr
+ sb.WriteString(fmt.Sprintf("(ast: %T)", x)) // nil, ast.BadExpr, ast.KeyValueExpr
case *ast.Ident:
- buf.WriteString(x.Name)
+ sb.WriteString(x.Name)
case *ast.Ellipsis:
- buf.WriteString("...")
+ sb.WriteString("...")
if x.Elt != nil {
- WriteExpr(buf, x.Elt)
+ WriteExpr(sb, x.Elt)
}
case *ast.BasicLit:
- buf.WriteString(x.Value)
+ sb.WriteString(x.Value)
case *ast.FuncLit:
- buf.WriteByte('(')
- WriteExpr(buf, x.Type)
- buf.WriteString(" literal)") // shortened
+ sb.WriteByte('(')
+ WriteExpr(sb, x.Type)
+ sb.WriteString(" literal)") // shortened
case *ast.CompositeLit:
- WriteExpr(buf, x.Type)
- buf.WriteByte('{')
+ WriteExpr(sb, x.Type)
+ sb.WriteByte('{')
if len(x.Elts) > 0 {
- buf.WriteString("…")
+ sb.WriteString("…")
}
- buf.WriteByte('}')
+ sb.WriteByte('}')
case *ast.ParenExpr:
- buf.WriteByte('(')
- WriteExpr(buf, x.X)
- buf.WriteByte(')')
+ sb.WriteByte('(')
+ WriteExpr(sb, x.X)
+ sb.WriteByte(')')
case *ast.SelectorExpr:
- WriteExpr(buf, x.X)
- buf.WriteByte('.')
- buf.WriteString(x.Sel.Name)
+ WriteExpr(sb, x.X)
+ sb.WriteByte('.')
+ sb.WriteString(x.Sel.Name)
case *ast.IndexExpr, *ast.IndexListExpr:
ix := typeparams.UnpackIndexExpr(x)
- WriteExpr(buf, ix.X)
- buf.WriteByte('[')
- writeExprList(buf, ix.Indices)
- buf.WriteByte(']')
+ WriteExpr(sb, ix.X)
+ sb.WriteByte('[')
+ writeExprList(sb, ix.Indices)
+ sb.WriteByte(']')
case *ast.SliceExpr:
- WriteExpr(buf, x.X)
- buf.WriteByte('[')
+ WriteExpr(sb, x.X)
+ sb.WriteByte('[')
if x.Low != nil {
- WriteExpr(buf, x.Low)
+ WriteExpr(sb, x.Low)
}
- buf.WriteByte(':')
+ sb.WriteByte(':')
if x.High != nil {
- WriteExpr(buf, x.High)
+ WriteExpr(sb, x.High)
}
if x.Slice3 {
- buf.WriteByte(':')
+ sb.WriteByte(':')
if x.Max != nil {
- WriteExpr(buf, x.Max)
+ WriteExpr(sb, x.Max)
}
}
- buf.WriteByte(']')
+ sb.WriteByte(']')
case *ast.TypeAssertExpr:
- WriteExpr(buf, x.X)
- buf.WriteString(".(")
- WriteExpr(buf, x.Type)
- buf.WriteByte(')')
+ WriteExpr(sb, x.X)
+ sb.WriteString(".(")
+ WriteExpr(sb, x.Type)
+ sb.WriteByte(')')
case *ast.CallExpr:
- WriteExpr(buf, x.Fun)
- buf.WriteByte('(')
- writeExprList(buf, x.Args)
+ WriteExpr(sb, x.Fun)
+ sb.WriteByte('(')
+ writeExprList(sb, x.Args)
if x.Ellipsis.IsValid() {
- buf.WriteString("...")
+ sb.WriteString("...")
}
- buf.WriteByte(')')
+ sb.WriteByte(')')
case *ast.StarExpr:
- buf.WriteByte('*')
- WriteExpr(buf, x.X)
+ sb.WriteByte('*')
+ WriteExpr(sb, x.X)
case *ast.UnaryExpr:
- buf.WriteString(x.Op.String())
- WriteExpr(buf, x.X)
+ sb.WriteString(x.Op.String())
+ WriteExpr(sb, x.X)
case *ast.BinaryExpr:
- WriteExpr(buf, x.X)
- buf.WriteByte(' ')
- buf.WriteString(x.Op.String())
- buf.WriteByte(' ')
- WriteExpr(buf, x.Y)
+ WriteExpr(sb, x.X)
+ sb.WriteByte(' ')
+ sb.WriteString(x.Op.String())
+ sb.WriteByte(' ')
+ WriteExpr(sb, x.Y)
case *ast.ArrayType:
- buf.WriteByte('[')
+ sb.WriteByte('[')
if x.Len != nil {
- WriteExpr(buf, x.Len)
+ WriteExpr(sb, x.Len)
}
- buf.WriteByte(']')
- WriteExpr(buf, x.Elt)
+ sb.WriteByte(']')
+ WriteExpr(sb, x.Elt)
case *ast.StructType:
- buf.WriteString("struct{")
- writeFieldList(buf, x.Fields.List, "; ", false)
- buf.WriteByte('}')
+ sb.WriteString("struct{")
+ writeFieldList(sb, x.Fields.List, "; ", false)
+ sb.WriteByte('}')
case *ast.FuncType:
- buf.WriteString("func")
- writeSigExpr(buf, x)
+ sb.WriteString("func")
+ writeSigExpr(sb, x)
case *ast.InterfaceType:
- buf.WriteString("interface{")
- writeFieldList(buf, x.Methods.List, "; ", true)
- buf.WriteByte('}')
+ sb.WriteString("interface{")
+ writeFieldList(sb, x.Methods.List, "; ", true)
+ sb.WriteByte('}')
case *ast.MapType:
- buf.WriteString("map[")
- WriteExpr(buf, x.Key)
- buf.WriteByte(']')
- WriteExpr(buf, x.Value)
+ sb.WriteString("map[")
+ WriteExpr(sb, x.Key)
+ sb.WriteByte(']')
+ WriteExpr(sb, x.Value)
case *ast.ChanType:
var s string
@@ -163,15 +163,15 @@
default:
s = "chan "
}
- buf.WriteString(s)
- WriteExpr(buf, x.Value)
+ sb.WriteString(s)
+ WriteExpr(sb, x.Value)
}
}
-func writeSigExpr(buf *bytes.Buffer, sig *ast.FuncType) {
- buf.WriteByte('(')
- writeFieldList(buf, sig.Params.List, ", ", false)
- buf.WriteByte(')')
+func writeSigExpr(sb *strings.Builder, sig *ast.FuncType) {
+ sb.WriteByte('(')
+ writeFieldList(sb, sig.Params.List, ", ", false)
+ sb.WriteByte(')')
res := sig.Results
n := res.NumFields()
@@ -180,59 +180,59 @@
return
}
- buf.WriteByte(' ')
+ sb.WriteByte(' ')
if n == 1 && len(res.List[0].Names) == 0 {
// single unnamed result
- WriteExpr(buf, res.List[0].Type)
+ WriteExpr(sb, res.List[0].Type)
return
}
// multiple or named result(s)
- buf.WriteByte('(')
- writeFieldList(buf, res.List, ", ", false)
- buf.WriteByte(')')
+ sb.WriteByte('(')
+ writeFieldList(sb, res.List, ", ", false)
+ sb.WriteByte(')')
}
-func writeFieldList(buf *bytes.Buffer, list []*ast.Field, sep string, iface bool) {
+func writeFieldList(sb *strings.Builder, list []*ast.Field, sep string, iface bool) {
for i, f := range list {
if i > 0 {
- buf.WriteString(sep)
+ sb.WriteString(sep)
}
// field list names
- writeIdentList(buf, f.Names)
+ writeIdentList(sb, f.Names)
// types of interface methods consist of signatures only
if sig, _ := f.Type.(*ast.FuncType); sig != nil && iface {
- writeSigExpr(buf, sig)
+ writeSigExpr(sb, sig)
continue
}
// named fields are separated with a blank from the field type
if len(f.Names) > 0 {
- buf.WriteByte(' ')
+ sb.WriteByte(' ')
}
- WriteExpr(buf, f.Type)
+ WriteExpr(sb, f.Type)
// ignore tag
}
}
-func writeIdentList(buf *bytes.Buffer, list []*ast.Ident) {
+func writeIdentList(sb *strings.Builder, list []*ast.Ident) {
for i, x := range list {
if i > 0 {
- buf.WriteString(", ")
+ sb.WriteString(", ")
}
- buf.WriteString(x.Name)
+ sb.WriteString(x.Name)
}
}
-func writeExprList(buf *bytes.Buffer, list []ast.Expr) {
+func writeExprList(sb *strings.Builder, list []ast.Expr) {
for i, x := range list {
if i > 0 {
- buf.WriteString(", ")
+ sb.WriteString(", ")
}
- WriteExpr(buf, x)
+ WriteExpr(sb, x)
}
}
To view, visit change 428135. To unsubscribe, or for help writing mail filters, visit settings.
xie cui (Gerrit)
Sep 2, 2022, 8:17:28 PM9/2/22
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Attention is currently required from: Robert Findley, Robert Griesemer.
xie cui uploaded patch set #2 to this change.
go/types: use strings.Builder
Change-Id: I68ebf95764e4355a5bcbe2f065e0c368b475d7f0
---
M src/go/types/errors.go
M src/go/types/scope.go
M src/go/types/termlist.go
M src/go/types/typeset.go
4 files changed, 19 insertions(+), 9 deletions(-)
To view, visit change 428135. To unsubscribe, or for help writing mail filters, visit settings.
xie cui (Gerrit)
Sep 2, 2022, 8:27:12 PM9/2/22
to goph...@pubsubhelper.golang.org, Robert Griesemer, Robert Findley, Gopher Robot, golang-co...@googlegroups.com
Attention is currently required from: Robert Findley, Robert Griesemer.
Patch set 2:Run-TryBot +1
xie cui (Gerrit)
Sep 2, 2022, 8:33:39 PM9/2/22
to goph...@pubsubhelper.golang.org, Robert Griesemer, Robert Findley, Gopher Robot, golang-co...@googlegroups.com
xie cui abandoned this change.
Abandoned
To view, visit change 428135. To unsubscribe, or for help writing mail filters, visit settings.
Robert Griesemer (Gerrit)
Sep 2, 2022, 8:51:53 PM9/2/22
to xie cui, goph...@pubsubhelper.golang.org, Robert Griesemer, Robert Findley, Gopher Robot, golang-co...@googlegroups.com
1 comment:
Patchset:
See https://go-review.git.corp.google.com/c/go/+/428094 .
If I missed anything there it should be done in that CL.
Also, in general there's no need to rename buf to sb everywhere. buf is fine. Thanks.
To view, visit change 428135. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages