Skip to content

_codegen: modernize #1890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dolmen merged 2 commits into from
May 13, 2026
+19 −14
Merged

_codegen: modernize #1890

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2699be
_codegen: modernize
dolmen May 13, 2026
098f8d7
_codegen: use strings.Builder
dolmen May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions _codegen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,23 +177,22 @@ func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {
}

fset := token.NewFileSet()
files := make(map[string]*ast.File)
fileList := make([]*ast.File, len(pd.GoFiles))
for i, fname := range pd.GoFiles {
src, err := os.ReadFile(path.Join(pd.Dir, fname))
if err != nil {
return nil, nil, err
}
f, err := parser.ParseFile(fset, fname, src, parser.ParseComments|parser.AllErrors)
// SkipObjectResolution for less memory usage in the go/types era
f, err := parser.ParseFile(fset, fname, src, parser.ParseComments|parser.AllErrors|parser.SkipObjectResolution)
if err != nil {
return nil, nil, err
}
files[fname] = f
fileList[i] = f
}

cfg := types.Config{
Importer: importer.For("source", nil),
Importer: importer.ForCompiler(fset, "source", nil),
}
info := types.Info{
Defs: make(map[*ast.Ident]types.Object),
Expand All @@ -205,8 +204,10 @@ func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {

scope := tp.Scope()

ap, _ := ast.NewPackage(fset, files, nil, nil)
docs := doc.New(ap, pkg, 0)
docs, err := doc.NewFromFiles(fset, fileList, pkg)
if err != nil {
return nil, nil, err
}

return scope, docs, nil
}
Expand All @@ -227,7 +228,7 @@ func (f *testFunc) Qualifier(p *types.Package) string {
func (f *testFunc) Params() string {
sig := f.TypeInfo.Type().(*types.Signature)
params := sig.Params()
p := ""
var p strings.Builder
comma := ""
to := params.Len()
var i int
Expand All @@ -237,20 +238,23 @@ func (f *testFunc) Params() string {
}
for i = 1; i < to; i++ {
param := params.At(i)
p += fmt.Sprintf("%s%s %s", comma, param.Name(), types.TypeString(param.Type(), f.Qualifier))
p.WriteString(comma)
p.WriteString(param.Name())
p.WriteString(" ")
p.WriteString(types.TypeString(param.Type(), f.Qualifier))
comma = ", "
}
if sig.Variadic() {
param := params.At(params.Len() - 1)
p += fmt.Sprintf("%s%s ...%s", comma, param.Name(), types.TypeString(param.Type().(*types.Slice).Elem(), f.Qualifier))
fmt.Fprintf(&p, "%s%s ...%s", comma, param.Name(), types.TypeString(param.Type().(*types.Slice).Elem(), f.Qualifier))
}
return p
return p.String()
}

func (f *testFunc) ForwardedParams() string {
sig := f.TypeInfo.Type().(*types.Signature)
params := sig.Params()
p := ""
var p strings.Builder
comma := ""
to := params.Len()
var i int
Expand All @@ -260,14 +264,15 @@ func (f *testFunc) ForwardedParams() string {
}
for i = 1; i < to; i++ {
param := params.At(i)
p += fmt.Sprintf("%s%s", comma, param.Name())
p.WriteString(comma)
p.WriteString(param.Name())
comma = ", "
}
if sig.Variadic() {
param := params.At(params.Len() - 1)
p += fmt.Sprintf("%s%s...", comma, param.Name())
fmt.Fprintf(&p, "%s%s...", comma, param.Name())
}
return p
return p.String()
}

func (f *testFunc) ParamsFormat() string {
Expand Down