refactor: change order

上级 5645a3c6
...@@ -71,14 +71,6 @@ func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) { ...@@ -71,14 +71,6 @@ func (s *JavaIdentifierListener) ExitClassBody(ctx *parser.ClassBodyContext) {
currentNode = core_domain.NewDataStruct() currentNode = core_domain.NewDataStruct()
} }
func (s *JavaIdentifierListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) {
hasEnterClass = false
if currentNode.NodeName != "" {
nodes = append(nodes, *currentNode)
}
currentNode = core_domain.NewDataStruct()
}
func (s *JavaIdentifierListener) EnterConstructorDeclaration(ctx *parser.ConstructorDeclarationContext) { func (s *JavaIdentifierListener) EnterConstructorDeclaration(ctx *parser.ConstructorDeclarationContext) {
position := core_domain.CodePosition{ position := core_domain.CodePosition{
StartLine: ctx.GetStart().GetLine(), StartLine: ctx.GetStart().GetLine(),
...@@ -101,44 +93,6 @@ func (s *JavaIdentifierListener) ExitConstructorDeclaration(ctx *parser.Construc ...@@ -101,44 +93,6 @@ func (s *JavaIdentifierListener) ExitConstructorDeclaration(ctx *parser.Construc
currentNode.Functions = append(currentNode.Functions, currentMethod) currentNode.Functions = append(currentNode.Functions, currentMethod)
} }
func (s *JavaIdentifierListener) EnterInterfaceBodyDeclaration(ctx *parser.InterfaceBodyDeclarationContext) {
hasEnterClass = true
}
func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
startLine := ctx.GetStart().GetLine()
startLinePosition := ctx.GetStart().GetColumn()
stopLine := ctx.GetStop().GetLine()
stopLinePosition := ctx.GetStop().GetColumn()
name := ctx.IDENTIFIER().GetText()
//XXX: find the start position of {, not public
typeType := ctx.TypeTypeOrVoid().GetText()
if reflect.TypeOf(ctx.GetParent().GetParent().GetChild(0)).String() == "*parser.ModifierContext" {
common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
}
position := core_domain.CodePosition{
StartLine: startLine,
StartLinePosition: startLinePosition,
StopLine: stopLine,
StopLinePosition: stopLinePosition,
}
currentMethod = core_domain.CodeFunction{
Name: name,
ReturnType: typeType,
Override: isOverrideMethod,
Annotations: currentMethod.Annotations,
Position: position,
}
}
func (s *JavaIdentifierListener) ExitInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
currentNode.Functions = append(currentNode.Functions, currentMethod)
currentMethod = core_domain.NewJMethod()
}
var isOverrideMethod = false var isOverrideMethod = false
func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclarationContext) { func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclarationContext) {
...@@ -206,6 +160,52 @@ func (s *JavaIdentifierListener) EnterInterfaceDeclaration(ctx *parser.Interface ...@@ -206,6 +160,52 @@ func (s *JavaIdentifierListener) EnterInterfaceDeclaration(ctx *parser.Interface
currentNode.NodeName = ctx.IDENTIFIER().GetText() currentNode.NodeName = ctx.IDENTIFIER().GetText()
} }
func (s *JavaIdentifierListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) {
hasEnterClass = false
if currentNode.NodeName != "" {
nodes = append(nodes, *currentNode)
}
currentNode = core_domain.NewDataStruct()
}
func (s *JavaIdentifierListener) EnterInterfaceBodyDeclaration(ctx *parser.InterfaceBodyDeclarationContext) {
hasEnterClass = true
}
func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
startLine := ctx.GetStart().GetLine()
startLinePosition := ctx.GetStart().GetColumn()
stopLine := ctx.GetStop().GetLine()
stopLinePosition := ctx.GetStop().GetColumn()
name := ctx.IDENTIFIER().GetText()
//XXX: find the start position of {, not public
typeType := ctx.TypeTypeOrVoid().GetText()
if reflect.TypeOf(ctx.GetParent().GetParent().GetChild(0)).String() == "*parser.ModifierContext" {
common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
}
position := core_domain.CodePosition{
StartLine: startLine,
StartLinePosition: startLinePosition,
StopLine: stopLine,
StopLinePosition: stopLinePosition,
}
currentMethod = core_domain.CodeFunction{
Name: name,
ReturnType: typeType,
Override: isOverrideMethod,
Annotations: currentMethod.Annotations,
Position: position,
}
}
func (s *JavaIdentifierListener) ExitInterfaceMethodDeclaration(ctx *parser.InterfaceMethodDeclarationContext) {
currentNode.Functions = append(currentNode.Functions, currentMethod)
currentMethod = core_domain.NewJMethod()
}
func (s *JavaIdentifierListener) EnterExpression(ctx *parser.ExpressionContext) { func (s *JavaIdentifierListener) EnterExpression(ctx *parser.ExpressionContext) {
if reflect.TypeOf(ctx.GetParent()).String() == "*parser.StatementContext" { if reflect.TypeOf(ctx.GetParent()).String() == "*parser.StatementContext" {
statementCtx := ctx.GetParent().(*parser.StatementContext) statementCtx := ctx.GetParent().(*parser.StatementContext)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册