refactor: simplify jidentfier code

上级 dccebc77
package core_domain package core_domain
var methods []CodeFunction
type JIdentifier struct { type JIdentifier struct {
Package string Package string
ClassName string ClassName string
...@@ -14,17 +12,7 @@ type JIdentifier struct { ...@@ -14,17 +12,7 @@ type JIdentifier struct {
} }
func NewJIdentifier() *JIdentifier { func NewJIdentifier() *JIdentifier {
identifier := &JIdentifier{"", "", "", "", nil, nil, nil, nil} return &JIdentifier{}
methods = nil
return identifier
}
func (identifier *JIdentifier) AddMethod(method CodeFunction) {
methods = append(methods, method)
}
func (identifier *JIdentifier) GetMethods() []CodeFunction {
return methods
} }
func (identifier *JIdentifier) GetClassFullName() string { func (identifier *JIdentifier) GetClassFullName() string {
......
...@@ -66,7 +66,6 @@ func (s *JavaIdentifierListener) EnterClassDeclaration(ctx *parser.ClassDeclarat ...@@ -66,7 +66,6 @@ func (s *JavaIdentifierListener) EnterClassDeclaration(ctx *parser.ClassDeclarat
func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) { func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) {
hasEnterClass = false hasEnterClass = false
if currentNode.ClassName != "" { if currentNode.ClassName != "" {
currentNode.Methods = currentNode.GetMethods()
nodes = append(nodes, *currentNode) nodes = append(nodes, *currentNode)
} }
currentNode = core_domain.NewJIdentifier() currentNode = core_domain.NewJIdentifier()
...@@ -75,7 +74,6 @@ func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) { ...@@ -75,7 +74,6 @@ func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) {
func (s *JavaIdentifierListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) { func (s *JavaIdentifierListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) {
hasEnterClass = false hasEnterClass = false
if currentNode.ClassName != "" { if currentNode.ClassName != "" {
currentNode.Methods = currentNode.GetMethods()
nodes = append(nodes, *currentNode) nodes = append(nodes, *currentNode)
} }
currentNode = core_domain.NewJIdentifier() currentNode = core_domain.NewJIdentifier()
...@@ -100,7 +98,7 @@ func (s *JavaIdentifierListener) EnterConstructorDeclaration(ctx *parser.Constru ...@@ -100,7 +98,7 @@ func (s *JavaIdentifierListener) EnterConstructorDeclaration(ctx *parser.Constru
} }
func (s *JavaIdentifierListener) ExitConstructorDeclaration(ctx *parser.ConstructorDeclarationContext) { func (s *JavaIdentifierListener) ExitConstructorDeclaration(ctx *parser.ConstructorDeclarationContext) {
currentNode.AddMethod(currentMethod) currentNode.Methods = append(currentNode.Methods, currentMethod)
} }
func (s *JavaIdentifierListener) EnterInterfaceBodyDeclaration(ctx *parser.InterfaceBodyDeclarationContext) { func (s *JavaIdentifierListener) EnterInterfaceBodyDeclaration(ctx *parser.InterfaceBodyDeclarationContext) {
...@@ -137,7 +135,7 @@ func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.Int ...@@ -137,7 +135,7 @@ func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.Int
} }
func (s *JavaIdentifierListener) ExitInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) { func (s *JavaIdentifierListener) ExitInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
currentNode.AddMethod(currentMethod) currentNode.Methods = append(currentNode.Methods, currentMethod)
currentMethod = core_domain.NewJMethod() currentMethod = core_domain.NewJMethod()
} }
...@@ -186,7 +184,7 @@ func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclar ...@@ -186,7 +184,7 @@ func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclar
} }
func (s *JavaIdentifierListener) ExitMethodDeclaration(ctx *parser.MethodDeclarationContext) { func (s *JavaIdentifierListener) ExitMethodDeclaration(ctx *parser.MethodDeclarationContext) {
currentNode.AddMethod(currentMethod) currentNode.Methods = append(currentNode.Methods, currentMethod)
currentMethod = core_domain.NewJMethod() currentMethod = core_domain.NewJMethod()
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册