github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 09:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor goctl (#902)

Browse Source
This commit is contained in:
Kevin Wan 2021-08-11 18:04:42 +08:00 committed by GitHub
parent 0b0406f41a
commit 1fb356f328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/logx/logs.go
View File

@ -197,7 +197,7 @@ func Disable() {
}) })
} }
// DisableStat to disable stat logs // DisableStat disables the stat logs.
func DisableStat() { func DisableStat() {
atomic.StoreUint32(&disableStat, 1) atomic.StoreUint32(&disableStat, 1)
} }

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

@ -104,6 +104,7 @@ func (v *ApiVisitor) newExprWithTerminalNode(node antlr.TerminalNode) *defaultEx
if node == nil { if node == nil {
return nil return nil
} }
token := node.GetSymbol() token := node.GetSymbol()
return v.newExprWithToken(token) return v.newExprWithToken(token)
} }
@ -132,6 +133,7 @@ func (v *ApiVisitor) newExprWithText(text string, line, column, start, stop int)
instance.column = column instance.column = column
instance.start = start instance.start = start
instance.stop = stop instance.stop = stop
return instance return instance
} }
@ -248,8 +250,7 @@ func EqualDoc(spec1, spec2 Spec) bool {
} }
func (v *ApiVisitor) getDoc(t TokenStream) []Expr { func (v *ApiVisitor) getDoc(t TokenStream) []Expr {
list := v.getHiddenTokensToLeft(t, api.COMEMNTS, false) return v.getHiddenTokensToLeft(t, api.COMEMNTS, false)
return list
} }
func (v *ApiVisitor) getComment(t TokenStream) Expr { func (v *ApiVisitor) getComment(t TokenStream) Expr {
@ -273,11 +274,9 @@ func (v *ApiVisitor) getComment(t TokenStream) Expr {
func (v *ApiVisitor) getHiddenTokensToLeft(t TokenStream, channel int, containsCommentOfDefaultChannel bool) []Expr { func (v *ApiVisitor) getHiddenTokensToLeft(t TokenStream, channel int, containsCommentOfDefaultChannel bool) []Expr {
ct := t.GetParser().GetTokenStream().(*antlr.CommonTokenStream) ct := t.GetParser().GetTokenStream().(*antlr.CommonTokenStream)
tokens := ct.GetHiddenTokensToLeft(t.GetStart().GetTokenIndex(), channel) tokens := ct.GetHiddenTokensToLeft(t.GetStart().GetTokenIndex(), channel)
tmp := make([]antlr.Token, len(tokens))
copy(tmp, tokens)
var list []Expr var list []Expr
for _, each := range tmp { for _, each := range tokens {
if !containsCommentOfDefaultChannel { if !containsCommentOfDefaultChannel {
index := each.GetTokenIndex() - 1 index := each.GetTokenIndex() - 1

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

@ -66,7 +66,6 @@ func (p parser) convert2Spec() error {
func (p parser) fillInfo() { func (p parser) fillInfo() {
properties := make(map[string]string) properties := make(map[string]string)
if p.ast.Info != nil { if p.ast.Info != nil {
p.spec.Info = spec.Info{}
for _, kv := range p.ast.Info.Kvs { for _, kv := range p.ast.Info.Kvs {
properties[kv.Key.Text()] = kv.Value.Text() properties[kv.Key.Text()] = kv.Value.Text()
} }