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

refactor (#878)

Browse Source 
* refactor(tools ): refactor cod

Improve code readability and performance

* fix(tools ): fix len bug

Co-authored-by: ksco <hyang@33.cn>
This commit is contained in:
_ksco
2021-08-11 17:33:18 +08:00
committed by GitHub
parent e024aebb66
commit cc264dcf55
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/goctl/api/parser/g4/ast/api.go
View File

@@ -45,7 +45,7 @@ func (v *ApiVisitor) VisitApi(ctx *api.ApiContext) interface{} {
func (v *ApiVisitor) acceptService(root, final *Api) {
for _, service := range root.Service {
if _, ok := final.serviceM[service.ServiceApi.Name.Text()]; !ok && len(final.serviceM) > 0 {
v.panic(service.ServiceApi.Name, fmt.Sprintf("mutiple service declaration"))
v.panic(service.ServiceApi.Name, "multiple service declaration")
}
v.duplicateServerItemCheck(service)
@@ -75,11 +75,11 @@ func (v *ApiVisitor) acceptService(root, final *Api) {
}
if handlerExpr == nil {
v.panic(route.Route.Method, fmt.Sprintf("mismtached handler"))
v.panic(route.Route.Method, "mismatched handler")
}
if handlerExpr.Text() == "" {
v.panic(handlerExpr, fmt.Sprintf("mismtached handler"))
v.panic(handlerExpr, "mismatched handler")
}
if _, ok := final.handlerM[handlerExpr.Text()]; ok {
@@ -119,7 +119,7 @@ func (v *ApiVisitor) acceptInfo(root, final *Api) {
if root.Info != nil {
infoM := map[string]PlaceHolder{}
if final.Info != nil {
v.panic(root.Info.Info, fmt.Sprintf("mutiple info declaration"))
v.panic(root.Info.Info, "multiple info declaration")
}
for _, value := range root.Info.Kvs {
@@ -147,7 +147,7 @@ func (v *ApiVisitor) acceptImport(root, final *Api) {
func (v *ApiVisitor) acceptSyntax(root, final *Api) {
if root.Syntax != nil {
if final.Syntax != nil {
v.panic(root.Syntax.Syntax, fmt.Sprintf("mutiple syntax declaration"))
v.panic(root.Syntax.Syntax, "multiple syntax declaration")
}
final.Syntax = root.Syntax

12
tools/goctl/api/parser/g4/ast/ast.go
View File

@@ -193,11 +193,7 @@ func (e *defaultExpr) Stop() int {
func (e *defaultExpr) Equal(expr Expr) bool {
if e == nil {
if expr != nil {
return false
}
return true
return expr == nil
}
if expr == nil {
@@ -277,10 +273,8 @@ func (v *ApiVisitor) getComment(t TokenStream) Expr {
func (v *ApiVisitor) getHiddenTokensToLeft(t TokenStream, channel int, containsCommentOfDefaultChannel bool) []Expr {
ct := t.GetParser().GetTokenStream().(*antlr.CommonTokenStream)
tokens := ct.GetHiddenTokensToLeft(t.GetStart().GetTokenIndex(), channel)
var tmp []antlr.Token
for _, each := range tokens {
tmp = append(tmp, each)
}
tmp := make([]antlr.Token, len(tokens))
copy(tmp, tokens)
var list []Expr
for _, each := range tmp {