zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix conflict with the import package name (#2610)

Browse Source 
Co-authored-by: chenjieping <chenjieping@kezaihui.com>
Co-authored-by: Kevin Wan <wanjunfeng@gmail.com>
This commit is contained in:
chensy
2022-11-20 15:23:25 +08:00
committed by GitHub
parent 94708cc78f
commit 20e659749a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/goctl/api/parser/parser.go
View File

@@ -18,19 +18,19 @@ type parser struct {
// Parse parses the api file // Parse parses the api file
func Parse(filename string) (*spec.ApiSpec, error) { func Parse(filename string) (*spec.ApiSpec, error) {
astParser := ast.NewParser(ast.WithParserPrefix(filepath.Base(filename)), ast.WithParserDebug()) astParser := ast.NewParser(ast.WithParserPrefix(filepath.Base(filename)), ast.WithParserDebug())
ast, err := astParser.Parse(filename) parsedApi, err := astParser.Parse(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
spec := new(spec.ApiSpec) apiSpec := new(spec.ApiSpec)
p := parser{ast: ast, spec: spec} p := parser{ast: parsedApi, spec: apiSpec}
err = p.convert2Spec() err = p.convert2Spec()
if err != nil { if err != nil {
return nil, err return nil, err
} }
return spec, nil return apiSpec, nil
} }
func parseContent(content string, skipCheckTypeDeclaration bool, filename ...string) (*spec.ApiSpec, error) { func parseContent(content string, skipCheckTypeDeclaration bool, filename ...string) (*spec.ApiSpec, error) {
@@ -40,19 +40,19 @@ func parseContent(content string, skipCheckTypeDeclaration bool, filename ...str
} else { } else {
astParser = ast.NewParser() astParser = ast.NewParser()
} }
ast, err := astParser.ParseContent(content, filename...) parsedApi, err := astParser.ParseContent(content, filename...)
if err != nil { if err != nil {
return nil, err return nil, err
} }
spec := new(spec.ApiSpec) apiSpec := new(spec.ApiSpec)
p := parser{ast: ast, spec: spec} p := parser{ast: parsedApi, spec: apiSpec}
err = p.convert2Spec() err = p.convert2Spec()
if err != nil { if err != nil {
return nil, err return nil, err
} }
return spec, nil return apiSpec, nil
} }
// ParseContent parses the api content // ParseContent parses the api content