Skip to content

Commit d2699be

Browse files
committed
_codegen: modernize
Modernize the code generator for the go/types era: - enable go/parser.SkipObjectResolution for reduced resource usage - replace use of deprecated functions which use object resolution
1 parent a463c8c commit d2699be

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

‎_codegen/main.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,23 +177,22 @@ func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {
177177
}
178178

179179
fset := token.NewFileSet()
180-
files := make(map[string]*ast.File)
181180
fileList := make([]*ast.File, len(pd.GoFiles))
182181
for i, fname := range pd.GoFiles {
183182
src, err := os.ReadFile(path.Join(pd.Dir, fname))
184183
if err != nil {
185184
return nil, nil, err
186185
}
187-
f, err := parser.ParseFile(fset, fname, src, parser.ParseComments|parser.AllErrors)
186+
// SkipObjectResolution for less memory usage in the go/types era
187+
f, err := parser.ParseFile(fset, fname, src, parser.ParseComments|parser.AllErrors|parser.SkipObjectResolution)
188188
if err != nil {
189189
return nil, nil, err
190190
}
191-
files[fname] = f
192191
fileList[i] = f
193192
}
194193

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

206205
scope := tp.Scope()
207206

208-
ap, _ := ast.NewPackage(fset, files, nil, nil)
209-
docs := doc.New(ap, pkg, 0)
207+
docs, err := doc.NewFromFiles(fset, fileList, pkg)
208+
if err != nil {
209+
return nil, nil, err
210+
}
210211

211212
return scope, docs, nil
212213
}

0 commit comments

Comments
 (0)