refactor: renaming ast

pkg/adapter/cocafile/file_analysis_helper_test.go

@@ -3,14 +3,14 @@ package cocafile
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	. "github.com/onsi/gomega"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
-	"github.com/phodal/coca/pkg/infrastructure/ast/identifier"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java/java_identify"
 	"testing"
 )
 
 func TestJavaCallApp_ProcessStringWorks(t *testing.T) {
 	g := NewGomegaWithT(t)
-	parser := ast.ProcessJavaString(`
+	parser := ast_java.ProcessJavaString(`
 package com.phodal.coca.analysis.identifier.model;
 
 public class DataClass {
@@ -24,7 +24,7 @@ public class DataClass {
 `)
 
 	context := parser.CompilationUnit()
-	listener := identifier.NewJavaIdentifierListener()
+	listener := java_identify.NewJavaIdentifierListener()
 
 	antlr.NewParseTreeWalker().Walk(listener, context)
 

pkg/application/analysis/goapp/go_ident_app.go

@@ -2,7 +2,7 @@ package goapp
 
 import (
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/cocago"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_go"
 	"io/ioutil"
 	"strings"
 )
@@ -30,7 +30,7 @@ func (g *GoIdentApp) AnalysisPackageManager(path string) core_domain.CodePackage
 }
 
 func (g *GoIdentApp) Analysis(code string, fileName string) core_domain.CodeFile {
-	parser := cocago.NewCocagoParser()
+	parser := ast_go.NewCocagoParser()
 	var codeMembers []core_domain.CodeMember
 	if g.Extensions != nil {
 		codeMembers = g.Extensions.([]core_domain.CodeMember)
@@ -42,7 +42,7 @@ func (g *GoIdentApp) Analysis(code string, fileName string) core_domain.CodeFile
 }
 
 func (g *GoIdentApp) IdentAnalysis(code string, fileName string) []core_domain.CodeMember {
-	parser := cocago.NewCocagoParser()
+	parser := ast_go.NewCocagoParser()
 	codeFile := parser.IdentAnalysis(code, fileName)
 	return codeFile.Members
 }

pkg/application/analysis/javaapp/java_full_app.go

@@ -5,8 +5,7 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
-	"github.com/phodal/coca/pkg/infrastructure/ast/full"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
 	"path/filepath"
 )
 
@@ -34,10 +33,10 @@ func (j *JavaFullApp) AnalysisFiles(identNodes []core_domain.CodeDataStruct, fil
 		displayName := filepath.Base(file)
 		fmt.Println("Refactoring parse java call: " + displayName)
 
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
-		listener := full.NewJavaFullListener(identMap, file)
+		listener := ast_java.NewJavaFullListener(identMap, file)
 		listener.AppendClasses(classes)
 
 		antlr.NewParseTreeWalker().Walk(listener, context)

pkg/application/analysis/javaapp/java_identifier_app.go

@@ -4,8 +4,8 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
-	"github.com/phodal/coca/pkg/infrastructure/ast/identifier"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java/java_identify"
 )
 
 
@@ -25,10 +25,10 @@ func (j *JavaIdentifierApp) AnalysisFiles(files []string) []core_domain.CodeData
 	var nodeInfos []core_domain.CodeDataStruct = nil
 
 	for _, file := range files {
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
-		listener := identifier.NewJavaIdentifierListener()
+		listener := java_identify.NewJavaIdentifierListener()
 
 		antlr.NewParseTreeWalker().Walk(listener, context)
 

pkg/application/analysis/pyapp/py_ident_app.go

@@ -4,7 +4,7 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	parser "github.com/phodal/coca/languages/python"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/pyast"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_python"
 )
 
 func streamToParser(is antlr.CharStream) *parser.PythonParser {
@@ -30,7 +30,7 @@ func (p *PythonIdentApp) Analysis(code string, fileName string) core_domain.Code
 	scriptParser := ProcessTsString(code)
 	context := scriptParser.Root()
 
-	listener := pyast.NewPythonIdentListener(fileName)
+	listener := ast_python.NewPythonIdentListener(fileName)
 	antlr.NewParseTreeWalker().Walk(listener, context)
 
 	return listener.GetCodeFileInfo()

pkg/application/analysis/tsapp/ts_ident_app.go

@@ -4,7 +4,7 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	parser "github.com/phodal/coca/languages/ts"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/ts"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_typescript"
 )
 
 func processStream(is antlr.CharStream) *parser.TypeScriptParser {
@@ -30,7 +30,7 @@ func (t *TypeScriptIdentApp) Analysis(code string, fileName string) core_domain.
 	scriptParser := ProcessTsString(code)
 	context := scriptParser.Program()
 
-	listener := ts.NewTypeScriptIdentListener(fileName)
+	listener := ast_typescript.NewTypeScriptIdentListener(fileName)
 	antlr.NewParseTreeWalker().Walk(listener, context)
 
 	return listener.GetNodeInfo()

pkg/application/api/java_api_app.go

@@ -6,8 +6,8 @@ import (
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	api_domain2 "github.com/phodal/coca/pkg/domain/api_domain"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
 	"github.com/phodal/coca/pkg/infrastructure/ast/api"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
 	"path/filepath"
 )
 
@@ -25,7 +25,7 @@ func (j *JavaApiApp) AnalysisPath(codeDir string, parsedDeps []core_domain.CodeD
 		displayName := filepath.Base(file)
 		fmt.Println("Refactoring parse java call: " + displayName)
 
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
 		listener := api.NewJavaAPIListener(identifiersMap, diMap)

pkg/application/bs/bad_smell_app.go

@@ -5,8 +5,8 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	"github.com/phodal/coca/pkg/domain/bs_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
-	"github.com/phodal/coca/pkg/infrastructure/ast/bs"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
+	"github.com/phodal/coca/pkg/infrastructure/ast/bs_java"
 	"path/filepath"
 )
 
@@ -29,10 +29,10 @@ func (j *BadSmellApp) AnalysisPath(codeDir string) *[]bs_domain.BSDataStruct {
 		displayName := filepath.Base(file)
 		fmt.Println("Refactoring parse java call: " + displayName)
 
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
-		listener := bs.NewBadSmellListener()
+		listener := bs_java.NewBadSmellListener()
 
 		antlr.NewParseTreeWalker().Walk(listener, context)
 

pkg/application/deps/gradle_analysis.go

@@ -4,8 +4,7 @@ import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/cmd/cmd_util"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
-	"github.com/phodal/coca/pkg/infrastructure/ast/groovy"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_groovy"
 )
 
 func AnalysisGradleFile(path string) []core_domain.CodeDependency {
@@ -14,9 +13,9 @@ func AnalysisGradleFile(path string) []core_domain.CodeDependency {
 }
 
 func AnalysisGradleString(str string) []core_domain.CodeDependency {
-	parser := ast.ProcessGroovyString(str)
+	parser := ast_groovy.ProcessGroovyString(str)
 	context := parser.CompilationUnit()
-	listener := groovy.NewGroovyIdentListener()
+	listener := ast_groovy.NewGroovyIdentListener()
 	antlr.NewParseTreeWalker().Walk(listener, context)
 
 	return listener.GetDepsInfo()

pkg/application/refactor/moveclass/move_class_app.go

@@ -7,7 +7,7 @@ import (
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	base2 "github.com/phodal/coca/pkg/application/refactor/base"
 	models2 "github.com/phodal/coca/pkg/application/refactor/base/models"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
 	"io"
 	"io/ioutil"
 	"log"
@@ -41,7 +41,7 @@ func (j *MoveClassApp) Analysis() []models2.JMoveStruct {
 
 		currentFile, _ = filepath.Abs(file)
 
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
 		node := models2.NewJFullIdentifier()

pkg/application/refactor/unused/remove_unused_import.go

@@ -6,7 +6,7 @@ import (
 	"github.com/phodal/coca/pkg/adapter/cocafile"
 	base2 "github.com/phodal/coca/pkg/application/refactor/base"
 	models2 "github.com/phodal/coca/pkg/application/refactor/base/models"
-	"github.com/phodal/coca/pkg/infrastructure/ast"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -36,7 +36,7 @@ func (j *RemoveUnusedImportApp) Analysis() []models2.JFullIdentifier {
 		displayName := filepath.Base(file)
 		fmt.Println("Refactoring parse java call: " + displayName)
 
-		parser := ast.ProcessJavaFile(file)
+		parser := ast_java.ProcessJavaFile(file)
 		context := parser.CompilationUnit()
 
 		node := models2.NewJFullIdentifier()

pkg/application/sql/sql_identifier_app.go

@@ -3,7 +3,7 @@ package sql
 import (
 	"fmt"
 	"github.com/antlr/antlr4/runtime/Go/antlr"
-	"github.com/phodal/coca/pkg/infrastructure/ast/sql"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_sql"
 	"github.com/phodal/coca/pkg/infrastructure/xmlparse"
 	parser2 "github.com/phodal/coca/languages/sql"
 	"os"
@@ -19,7 +19,7 @@ func NewSqlIdentifierApp() SqlIdentifierApp {
 	return SqlIdentifierApp{}
 }
 
-func (j *SqlIdentifierApp) AnalysisPath(codeDir string) []sql.SQLNode {
+func (j *SqlIdentifierApp) AnalysisPath(codeDir string) []ast_sql.SQLNode {
 	xmlFiles := (*SqlIdentifierApp)(nil).xmlFiles(codeDir)
 	for _, xmlFile := range xmlFiles {
 		xmlFile, err := os.Open(xmlFile)
@@ -35,7 +35,7 @@ func (j *SqlIdentifierApp) AnalysisPath(codeDir string) []sql.SQLNode {
 		}
 	}
 
-	var infos []sql.SQLNode
+	var infos []ast_sql.SQLNode
 	files := (*SqlIdentifierApp)(nil).sqlFiles(codeDir)
 	for index := range files {
 		file := files[index]
@@ -43,7 +43,7 @@ func (j *SqlIdentifierApp) AnalysisPath(codeDir string) []sql.SQLNode {
 		parser := (*SqlIdentifierApp)(nil).processFile(file)
 		context := parser.Parse()
 
-		listener := sql.NewSqlIdentifierListener()
+		listener := ast_sql.NewSqlIdentifierListener()
 
 		antlr.NewParseTreeWalker().Walk(listener, context)
 

pkg/infrastructure/ast/cocago/cocago_builder.go → pkg/infrastructure/ast/ast_go/cocago_builder.go

-package cocago
+package ast_go
 
 import (
 	"fmt"

pkg/infrastructure/ast/cocago/cocago_parser.go → pkg/infrastructure/ast/ast_go/cocago_parser.go

-package cocago
+package ast_go
 
 import (
 	"bytes"

pkg/infrastructure/ast/cocago/cocago_parser_test.go → pkg/infrastructure/ast/ast_go/cocago_parser_test.go

-package cocago
+package ast_go
 
 import (
 	"fmt"

pkg/infrastructure/ast/cocago/cocago_regression_test.go → pkg/infrastructure/ast/ast_go/cocago_regression_test.go

-package cocago
+package ast_go
 
 func getRegressionFile(name string) string {
 	return "testdata/regression/" + name

pkg/infrastructure/ast/cocago/parser_panic_test.go → pkg/infrastructure/ast/ast_go/parser_panic_test.go

-package cocago
+package ast_go
 
 import (
 	"github.com/phodal/coca/cocatest"

pkg/infrastructure/ast/groovy/GroovyIdentifierListener.go → pkg/infrastructure/ast/ast_groovy/GroovyIdentifierListener.go

-package groovy
+package ast_groovy
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"

pkg/infrastructure/ast/gradle_process_helper.go → pkg/infrastructure/ast/ast_groovy/gradle_process_helper.go

-package ast
+package ast_groovy
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"

pkg/infrastructure/ast/full/ast_java_target_handler.go → pkg/infrastructure/ast/ast_java/ast_java_target_handler.go

-package full
+package ast_java
 
 import (
 	"github.com/phodal/coca/languages/java"

pkg/infrastructure/ast/full/java_full_converter.go → pkg/infrastructure/ast/ast_java/java_full_converter.go

-package full
+package ast_java
 
 import (
 	"github.com/phodal/coca/languages/java"

pkg/infrastructure/ast/full/java_full_listener.go → pkg/infrastructure/ast/ast_java/java_full_listener.go

-package full
+package ast_java
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/languages/java"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/common_listener"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java/common_listener"
 	"reflect"
 	"strconv"
 	"strings"

pkg/infrastructure/ast/ast_java/java_full_listener_test.go

+package ast_java

pkg/infrastructure/ast/identifier/java_identifier_listener.go → pkg/infrastructure/ast/ast_java/java_identify/java_identifier_listener.go

-package identifier
+package java_identify
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/languages/java"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	common_listener2 "github.com/phodal/coca/pkg/infrastructure/ast/common_listener"
+	"github.com/phodal/coca/pkg/infrastructure/ast/ast_java/common_listener"
 	"reflect"
 	"strings"
 )
@@ -115,7 +115,7 @@ func (s *JavaIdentifierListener) EnterInterfaceMethodDeclaration(ctx *parser.Int
 	typeType := ctx.TypeTypeOrVoid().GetText()
 
 	if reflect.TypeOf(ctx.GetParent().GetParent().GetChild(0)).String() == "*parser.ModifierContext" {
-		common_listener2.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
+		common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
 	}
 
 	position := core_domain.CodePosition{
@@ -153,7 +153,7 @@ func (s *JavaIdentifierListener) EnterMethodDeclaration(ctx *parser.MethodDeclar
 	typeType := ctx.TypeTypeOrVoid().GetText()
 
 	if reflect.TypeOf(ctx.GetParent().GetParent().GetChild(0)).String() == "*parser.ModifierContext" {
-		common_listener2.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
+		common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), &currentMethod)
 	}
 
 	position := core_domain.CodePosition{
@@ -195,7 +195,7 @@ func (s *JavaIdentifierListener) EnterAnnotation(ctx *parser.AnnotationContext)
 	}
 
 	if !hasEnterClass {
-		annotation := common_listener2.BuildAnnotation(ctx)
+		annotation := common_listener.BuildAnnotation(ctx)
 		currentNode.Annotations = append(currentNode.Annotations, annotation)
 	}
 }

pkg/infrastructure/ast/java_process_helper.go → pkg/infrastructure/ast/ast_java/java_process_helper.go

-package ast
+package ast_java
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"

pkg/infrastructure/ast/pyast/python_ident_listener.go → pkg/infrastructure/ast/ast_python/python_ident_listener.go

-package pyast
+package ast_python
 
 import (
 	"bytes"
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	parser "github.com/phodal/coca/languages/python"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/ast_util"
+	"github.com/phodal/coca/pkg/infrastructure/ast/astutil"
 	"io"
 	"os"
 	"strings"
@@ -80,7 +80,7 @@ func (s *PythonIdentListener) EnterClassdef(ctx *parser.ClassdefContext) {
 		InOutProperties: nil,
 	}
 
-	ctxIndex := ast_util.GetNodeIndex(ctx)
+	ctxIndex := astutil.GetNodeIndex(ctx)
 	if ctxIndex > 0 {
 		decorators := BuildDecoratorsByIndex(ctx, ctxIndex)
 		dataStruct.Annotations = decorators
@@ -101,7 +101,7 @@ func (s *PythonIdentListener) EnterFuncdef(ctx *parser.FuncdefContext) {
 		Name: ctx.Name().GetText(),
 	}
 
-	ctxIndex := ast_util.GetNodeIndex(ctx)
+	ctxIndex := astutil.GetNodeIndex(ctx)
 	if ctxIndex > 0 {
 		decorators := BuildDecoratorsByIndex(ctx, ctxIndex)
 		function.Annotations = decorators

pkg/infrastructure/ast/sql/sql_identifier_listener.go → pkg/infrastructure/ast/ast_sql/sql_identifier_listener.go

-package sql
+package ast_sql
 
 import (
 	"fmt"

pkg/infrastructure/ast/ts/typescript_ident_converter.go → pkg/infrastructure/ast/ast_typescript/typescript_ident_converter.go

-package ts
+package ast_typescript
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	"github.com/phodal/coca/languages/ts"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/ast_util"
+	"github.com/phodal/coca/pkg/infrastructure/ast/astutil"
 )
 
 func BuildConstructorMethod(ctx *parser.ConstructorDeclarationContext) *core_domain.CodeFunction {
@@ -12,7 +12,7 @@ func BuildConstructorMethod(ctx *parser.ConstructorDeclarationContext) *core_dom
 		Name: "constructor",
 	}
 
-	ast_util.AddFunctionPosition(function, ctx.GetChild(0).GetParent().(*antlr.BaseParserRuleContext))
+	astutil.AddFunctionPosition(function, ctx.GetChild(0).GetParent().(*antlr.BaseParserRuleContext))
 
 	if ctx.AccessibilityModifier() != nil {
 		modifier := ctx.AccessibilityModifier().GetText()

pkg/infrastructure/ast/ts/typescript_ident_listener.go → pkg/infrastructure/ast/ast_typescript/typescript_ident_listener.go

-package ts
+package ast_typescript
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"
 	parser "github.com/phodal/coca/languages/ts"
 	"github.com/phodal/coca/pkg/domain/core_domain"
-	"github.com/phodal/coca/pkg/infrastructure/ast/ast_util"
+	"github.com/phodal/coca/pkg/infrastructure/ast/astutil"
 	"strings"
 )
 
@@ -235,7 +235,7 @@ func (s *TypeScriptIdentListener) EnterFunctionDeclaration(ctx *parser.FunctionD
 	callSignatureContext := ctx.CallSignature().(*parser.CallSignatureContext)
 	FillMethodFromCallSignature(callSignatureContext, function)
 
-	ast_util.AddFunctionPosition(function, ctx.GetChild(0).GetParent().(*antlr.BaseParserRuleContext))
+	astutil.AddFunctionPosition(function, ctx.GetChild(0).GetParent().(*antlr.BaseParserRuleContext))
 
 	if s.currentDataStruct == nil {
 		s.currentDataStruct = &core_domain.CodeDataStruct{}

pkg/infrastructure/ast/ast_util/pare_tree_util.go → pkg/infrastructure/ast/astutil/pare_tree_util.go

-package ast_util
+package astutil
 
 import "github.com/antlr/antlr4/runtime/Go/antlr"
 

pkg/infrastructure/ast/ast_util/position.go → pkg/infrastructure/ast/astutil/position.go

-package ast_util
+package astutil
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"

pkg/infrastructure/ast/bs/bad_smell_listener.go → pkg/infrastructure/ast/bs_java/bad_smell_listener.go

-package bs
+package bs_java
 
 import (
 	"github.com/antlr/antlr4/runtime/Go/antlr"

pkg/infrastructure/ast/full/java_full_listener_test.go

-package full