From d0afa82c03481e7a919f32da4003757322f28f42 Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Sun, 26 Jan 2020 11:03:50 +0800 Subject: [PATCH] refactor: renaming ast --- pkg/adapter/cocafile/file_analysis_helper_test.go | 8 ++++---- pkg/application/analysis/goapp/go_ident_app.go | 6 +++--- pkg/application/analysis/javaapp/java_full_app.go | 7 +++---- .../analysis/javaapp/java_identifier_app.go | 8 ++++---- pkg/application/analysis/pyapp/py_ident_app.go | 4 ++-- pkg/application/analysis/tsapp/ts_ident_app.go | 4 ++-- pkg/application/api/java_api_app.go | 4 ++-- pkg/application/bs/bad_smell_app.go | 8 ++++---- pkg/application/deps/gradle_analysis.go | 7 +++---- pkg/application/refactor/moveclass/move_class_app.go | 4 ++-- .../refactor/unused/remove_unused_import.go | 4 ++-- pkg/application/sql/sql_identifier_app.go | 8 ++++---- .../ast/{cocago => ast_go}/cocago_builder.go | 2 +- .../ast/{cocago => ast_go}/cocago_parser.go | 2 +- .../ast/{cocago => ast_go}/cocago_parser_test.go | 2 +- .../ast/{cocago => ast_go}/cocago_regression_test.go | 2 +- .../ast/{cocago => ast_go}/parser_panic_test.go | 2 +- .../testdata/method_call/local_var_method_call.code | 0 .../testdata/method_call/local_var_method_call.json | 0 .../testdata/method_call/param_method_call.code | 0 .../testdata/method_call/param_method_call.json | 0 .../method_call/var_inside_method_with_call.code | 0 .../method_call/var_inside_method_with_call.json | 0 .../testdata/node_infos/anonymous_methods.code | 0 .../testdata/node_infos/basic_interface.code | 0 .../testdata/node_infos/basic_interface.json | 0 .../testdata/node_infos/data_struct_property.code | 0 .../testdata/node_infos/data_struct_property.json | 0 .../testdata/node_infos/hello_world.code | 0 .../testdata/node_infos/hello_world.json | 0 .../testdata/node_infos/multiple_method_call.code | 0 .../testdata/node_infos/multiple_method_call.json | 0 .../testdata/node_infos/nested_method.code | 0 .../testdata/node_infos/nested_method.json | 0 .../testdata/node_infos/normal_method.code | 0 .../testdata/node_infos/normal_method.json | 0 .../testdata/node_infos/struct_type_zero.code | 0 .../testdata/node_infos/struct_type_zero.json | 0 .../testdata/node_infos/struct_with_func.code | 0 .../testdata/node_infos/struct_with_func.json | 0 .../testdata/node_infos/struct_with_func_decl.code | 0 .../testdata/node_infos/struct_with_func_decl.json | 0 .../testdata/regression/coll_stack.code | 0 .../testdata/regression/coll_stack.json | 0 .../{groovy => ast_groovy}/GroovyIdentifierListener.go | 2 +- .../ast/{ => ast_groovy}/gradle_process_helper.go | 2 +- .../ast/{full => ast_java}/ast_java_target_handler.go | 2 +- .../{ => ast_java}/common_listener/common_listener.go | 0 .../ast/{full => ast_java}/java_full_converter.go | 2 +- .../ast/{full => ast_java}/java_full_listener.go | 4 ++-- .../ast/ast_java/java_full_listener_test.go | 1 + .../java_identify}/java_identifier_listener.go | 10 +++++----- .../ast/{ => ast_java}/java_process_helper.go | 2 +- .../ast/{pyast => ast_python}/python_ident_listener.go | 8 ++++---- .../ast/{sql => ast_sql}/sql_identifier_listener.go | 2 +- .../typescript_ident_converter.go | 6 +++--- .../typescript_ident_listener.go | 6 +++--- .../ast/{ast_util => astutil}/pare_tree_util.go | 2 +- .../ast/{ast_util => astutil}/position.go | 2 +- .../ast/{bs => bs_java}/bad_smell_listener.go | 2 +- pkg/infrastructure/ast/full/java_full_listener_test.go | 1 - 61 files changed, 67 insertions(+), 69 deletions(-) rename pkg/infrastructure/ast/{cocago => ast_go}/cocago_builder.go (99%) rename pkg/infrastructure/ast/{cocago => ast_go}/cocago_parser.go (99%) rename pkg/infrastructure/ast/{cocago => ast_go}/cocago_parser_test.go (99%) rename pkg/infrastructure/ast/{cocago => ast_go}/cocago_regression_test.go (96%) rename pkg/infrastructure/ast/{cocago => ast_go}/parser_panic_test.go (95%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/local_var_method_call.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/local_var_method_call.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/param_method_call.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/param_method_call.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/var_inside_method_with_call.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/method_call/var_inside_method_with_call.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/anonymous_methods.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/basic_interface.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/basic_interface.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/data_struct_property.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/data_struct_property.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/hello_world.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/hello_world.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/multiple_method_call.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/multiple_method_call.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/nested_method.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/nested_method.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/normal_method.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/normal_method.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_type_zero.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_type_zero.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_with_func.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_with_func.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_with_func_decl.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/node_infos/struct_with_func_decl.json (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/regression/coll_stack.code (100%) rename pkg/infrastructure/ast/{cocago => ast_go}/testdata/regression/coll_stack.json (100%) rename pkg/infrastructure/ast/{groovy => ast_groovy}/GroovyIdentifierListener.go (99%) rename pkg/infrastructure/ast/{ => ast_groovy}/gradle_process_helper.go (94%) rename pkg/infrastructure/ast/{full => ast_java}/ast_java_target_handler.go (99%) rename pkg/infrastructure/ast/{ => ast_java}/common_listener/common_listener.go (100%) rename pkg/infrastructure/ast/{full => ast_java}/java_full_converter.go (99%) rename pkg/infrastructure/ast/{full => ast_java}/java_full_listener.go (99%) create mode 100644 pkg/infrastructure/ast/ast_java/java_full_listener_test.go rename pkg/infrastructure/ast/{identifier => ast_java/java_identify}/java_identifier_listener.go (94%) rename pkg/infrastructure/ast/{ => ast_java}/java_process_helper.go (96%) rename pkg/infrastructure/ast/{pyast => ast_python}/python_ident_listener.go (96%) rename pkg/infrastructure/ast/{sql => ast_sql}/sql_identifier_listener.go (98%) rename pkg/infrastructure/ast/{ts => ast_typescript}/typescript_ident_converter.go (94%) rename pkg/infrastructure/ast/{ts => ast_typescript}/typescript_ident_listener.go (98%) rename pkg/infrastructure/ast/{ast_util => astutil}/pare_tree_util.go (96%) rename pkg/infrastructure/ast/{ast_util => astutil}/position.go (96%) rename pkg/infrastructure/ast/{bs => bs_java}/bad_smell_listener.go (99%) delete mode 100644 pkg/infrastructure/ast/full/java_full_listener_test.go diff --git a/pkg/adapter/cocafile/file_analysis_helper_test.go b/pkg/adapter/cocafile/file_analysis_helper_test.go index 1d4380a..ce06322 100644 --- a/pkg/adapter/cocafile/file_analysis_helper_test.go +++ b/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) diff --git a/pkg/application/analysis/goapp/go_ident_app.go b/pkg/application/analysis/goapp/go_ident_app.go index 921753c..ac19640 100644 --- a/pkg/application/analysis/goapp/go_ident_app.go +++ b/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 } diff --git a/pkg/application/analysis/javaapp/java_full_app.go b/pkg/application/analysis/javaapp/java_full_app.go index 87df6dd..67d4454 100644 --- a/pkg/application/analysis/javaapp/java_full_app.go +++ b/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) diff --git a/pkg/application/analysis/javaapp/java_identifier_app.go b/pkg/application/analysis/javaapp/java_identifier_app.go index 628c5a8..5332a70 100644 --- a/pkg/application/analysis/javaapp/java_identifier_app.go +++ b/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) diff --git a/pkg/application/analysis/pyapp/py_ident_app.go b/pkg/application/analysis/pyapp/py_ident_app.go index a0307ca..846e566 100644 --- a/pkg/application/analysis/pyapp/py_ident_app.go +++ b/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() diff --git a/pkg/application/analysis/tsapp/ts_ident_app.go b/pkg/application/analysis/tsapp/ts_ident_app.go index 9368c3d..665c88c 100644 --- a/pkg/application/analysis/tsapp/ts_ident_app.go +++ b/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() diff --git a/pkg/application/api/java_api_app.go b/pkg/application/api/java_api_app.go index 8d57c1f..fd52c74 100644 --- a/pkg/application/api/java_api_app.go +++ b/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) diff --git a/pkg/application/bs/bad_smell_app.go b/pkg/application/bs/bad_smell_app.go index 826527e..b82c127 100644 --- a/pkg/application/bs/bad_smell_app.go +++ b/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) diff --git a/pkg/application/deps/gradle_analysis.go b/pkg/application/deps/gradle_analysis.go index dd157cb..e682def 100644 --- a/pkg/application/deps/gradle_analysis.go +++ b/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() diff --git a/pkg/application/refactor/moveclass/move_class_app.go b/pkg/application/refactor/moveclass/move_class_app.go index 184462d..823a1da 100644 --- a/pkg/application/refactor/moveclass/move_class_app.go +++ b/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() diff --git a/pkg/application/refactor/unused/remove_unused_import.go b/pkg/application/refactor/unused/remove_unused_import.go index 07bb3f8..578af16 100644 --- a/pkg/application/refactor/unused/remove_unused_import.go +++ b/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() diff --git a/pkg/application/sql/sql_identifier_app.go b/pkg/application/sql/sql_identifier_app.go index 1241d14..84c00b6 100644 --- a/pkg/application/sql/sql_identifier_app.go +++ b/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) diff --git a/pkg/infrastructure/ast/cocago/cocago_builder.go b/pkg/infrastructure/ast/ast_go/cocago_builder.go similarity index 99% rename from pkg/infrastructure/ast/cocago/cocago_builder.go rename to pkg/infrastructure/ast/ast_go/cocago_builder.go index 499c59b..3f4d6d1 100644 --- a/pkg/infrastructure/ast/cocago/cocago_builder.go +++ b/pkg/infrastructure/ast/ast_go/cocago_builder.go @@ -1,4 +1,4 @@ -package cocago +package ast_go import ( "fmt" diff --git a/pkg/infrastructure/ast/cocago/cocago_parser.go b/pkg/infrastructure/ast/ast_go/cocago_parser.go similarity index 99% rename from pkg/infrastructure/ast/cocago/cocago_parser.go rename to pkg/infrastructure/ast/ast_go/cocago_parser.go index bc31874..dfe3ff5 100644 --- a/pkg/infrastructure/ast/cocago/cocago_parser.go +++ b/pkg/infrastructure/ast/ast_go/cocago_parser.go @@ -1,4 +1,4 @@ -package cocago +package ast_go import ( "bytes" diff --git a/pkg/infrastructure/ast/cocago/cocago_parser_test.go b/pkg/infrastructure/ast/ast_go/cocago_parser_test.go similarity index 99% rename from pkg/infrastructure/ast/cocago/cocago_parser_test.go rename to pkg/infrastructure/ast/ast_go/cocago_parser_test.go index 28c23bf..37ec1c1 100644 --- a/pkg/infrastructure/ast/cocago/cocago_parser_test.go +++ b/pkg/infrastructure/ast/ast_go/cocago_parser_test.go @@ -1,4 +1,4 @@ -package cocago +package ast_go import ( "fmt" diff --git a/pkg/infrastructure/ast/cocago/cocago_regression_test.go b/pkg/infrastructure/ast/ast_go/cocago_regression_test.go similarity index 96% rename from pkg/infrastructure/ast/cocago/cocago_regression_test.go rename to pkg/infrastructure/ast/ast_go/cocago_regression_test.go index 4209b60..215a78d 100644 --- a/pkg/infrastructure/ast/cocago/cocago_regression_test.go +++ b/pkg/infrastructure/ast/ast_go/cocago_regression_test.go @@ -1,4 +1,4 @@ -package cocago +package ast_go func getRegressionFile(name string) string { return "testdata/regression/" + name diff --git a/pkg/infrastructure/ast/cocago/parser_panic_test.go b/pkg/infrastructure/ast/ast_go/parser_panic_test.go similarity index 95% rename from pkg/infrastructure/ast/cocago/parser_panic_test.go rename to pkg/infrastructure/ast/ast_go/parser_panic_test.go index 7e6b975..9895599 100644 --- a/pkg/infrastructure/ast/cocago/parser_panic_test.go +++ b/pkg/infrastructure/ast/ast_go/parser_panic_test.go @@ -1,4 +1,4 @@ -package cocago +package ast_go import ( "github.com/phodal/coca/cocatest" diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/local_var_method_call.code b/pkg/infrastructure/ast/ast_go/testdata/method_call/local_var_method_call.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/local_var_method_call.code rename to pkg/infrastructure/ast/ast_go/testdata/method_call/local_var_method_call.code diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/local_var_method_call.json b/pkg/infrastructure/ast/ast_go/testdata/method_call/local_var_method_call.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/local_var_method_call.json rename to pkg/infrastructure/ast/ast_go/testdata/method_call/local_var_method_call.json diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/param_method_call.code b/pkg/infrastructure/ast/ast_go/testdata/method_call/param_method_call.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/param_method_call.code rename to pkg/infrastructure/ast/ast_go/testdata/method_call/param_method_call.code diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/param_method_call.json b/pkg/infrastructure/ast/ast_go/testdata/method_call/param_method_call.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/param_method_call.json rename to pkg/infrastructure/ast/ast_go/testdata/method_call/param_method_call.json diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/var_inside_method_with_call.code b/pkg/infrastructure/ast/ast_go/testdata/method_call/var_inside_method_with_call.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/var_inside_method_with_call.code rename to pkg/infrastructure/ast/ast_go/testdata/method_call/var_inside_method_with_call.code diff --git a/pkg/infrastructure/ast/cocago/testdata/method_call/var_inside_method_with_call.json b/pkg/infrastructure/ast/ast_go/testdata/method_call/var_inside_method_with_call.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/method_call/var_inside_method_with_call.json rename to pkg/infrastructure/ast/ast_go/testdata/method_call/var_inside_method_with_call.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/anonymous_methods.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/anonymous_methods.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/anonymous_methods.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/anonymous_methods.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/basic_interface.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/basic_interface.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/basic_interface.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/basic_interface.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/basic_interface.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/basic_interface.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/basic_interface.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/basic_interface.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/data_struct_property.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/data_struct_property.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/data_struct_property.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/data_struct_property.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/data_struct_property.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/data_struct_property.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/data_struct_property.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/data_struct_property.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/hello_world.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/hello_world.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/hello_world.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/hello_world.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/hello_world.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/hello_world.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/hello_world.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/hello_world.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/multiple_method_call.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/multiple_method_call.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/multiple_method_call.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/multiple_method_call.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/multiple_method_call.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/multiple_method_call.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/multiple_method_call.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/multiple_method_call.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/nested_method.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/nested_method.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/nested_method.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/nested_method.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/nested_method.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/nested_method.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/nested_method.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/nested_method.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/normal_method.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/normal_method.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/normal_method.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/normal_method.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/normal_method.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/normal_method.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/normal_method.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/normal_method.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_type_zero.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_type_zero.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_type_zero.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_type_zero.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_type_zero.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_type_zero.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_type_zero.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_type_zero.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func.json diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func_decl.code b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func_decl.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func_decl.code rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func_decl.code diff --git a/pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func_decl.json b/pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func_decl.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/node_infos/struct_with_func_decl.json rename to pkg/infrastructure/ast/ast_go/testdata/node_infos/struct_with_func_decl.json diff --git a/pkg/infrastructure/ast/cocago/testdata/regression/coll_stack.code b/pkg/infrastructure/ast/ast_go/testdata/regression/coll_stack.code similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/regression/coll_stack.code rename to pkg/infrastructure/ast/ast_go/testdata/regression/coll_stack.code diff --git a/pkg/infrastructure/ast/cocago/testdata/regression/coll_stack.json b/pkg/infrastructure/ast/ast_go/testdata/regression/coll_stack.json similarity index 100% rename from pkg/infrastructure/ast/cocago/testdata/regression/coll_stack.json rename to pkg/infrastructure/ast/ast_go/testdata/regression/coll_stack.json diff --git a/pkg/infrastructure/ast/groovy/GroovyIdentifierListener.go b/pkg/infrastructure/ast/ast_groovy/GroovyIdentifierListener.go similarity index 99% rename from pkg/infrastructure/ast/groovy/GroovyIdentifierListener.go rename to pkg/infrastructure/ast/ast_groovy/GroovyIdentifierListener.go index fd85814..0836e93 100644 --- a/pkg/infrastructure/ast/groovy/GroovyIdentifierListener.go +++ b/pkg/infrastructure/ast/ast_groovy/GroovyIdentifierListener.go @@ -1,4 +1,4 @@ -package groovy +package ast_groovy import ( "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/gradle_process_helper.go b/pkg/infrastructure/ast/ast_groovy/gradle_process_helper.go similarity index 94% rename from pkg/infrastructure/ast/gradle_process_helper.go rename to pkg/infrastructure/ast/ast_groovy/gradle_process_helper.go index 0ce47dc..6ed7834 100644 --- a/pkg/infrastructure/ast/gradle_process_helper.go +++ b/pkg/infrastructure/ast/ast_groovy/gradle_process_helper.go @@ -1,4 +1,4 @@ -package ast +package ast_groovy import ( "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/full/ast_java_target_handler.go b/pkg/infrastructure/ast/ast_java/ast_java_target_handler.go similarity index 99% rename from pkg/infrastructure/ast/full/ast_java_target_handler.go rename to pkg/infrastructure/ast/ast_java/ast_java_target_handler.go index 7462cba..4d26cbe 100644 --- a/pkg/infrastructure/ast/full/ast_java_target_handler.go +++ b/pkg/infrastructure/ast/ast_java/ast_java_target_handler.go @@ -1,4 +1,4 @@ -package full +package ast_java import ( "github.com/phodal/coca/languages/java" diff --git a/pkg/infrastructure/ast/common_listener/common_listener.go b/pkg/infrastructure/ast/ast_java/common_listener/common_listener.go similarity index 100% rename from pkg/infrastructure/ast/common_listener/common_listener.go rename to pkg/infrastructure/ast/ast_java/common_listener/common_listener.go diff --git a/pkg/infrastructure/ast/full/java_full_converter.go b/pkg/infrastructure/ast/ast_java/java_full_converter.go similarity index 99% rename from pkg/infrastructure/ast/full/java_full_converter.go rename to pkg/infrastructure/ast/ast_java/java_full_converter.go index 8e13695..c2d922d 100644 --- a/pkg/infrastructure/ast/full/java_full_converter.go +++ b/pkg/infrastructure/ast/ast_java/java_full_converter.go @@ -1,4 +1,4 @@ -package full +package ast_java import ( "github.com/phodal/coca/languages/java" diff --git a/pkg/infrastructure/ast/full/java_full_listener.go b/pkg/infrastructure/ast/ast_java/java_full_listener.go similarity index 99% rename from pkg/infrastructure/ast/full/java_full_listener.go rename to pkg/infrastructure/ast/ast_java/java_full_listener.go index d47b68e..4783069 100644 --- a/pkg/infrastructure/ast/full/java_full_listener.go +++ b/pkg/infrastructure/ast/ast_java/java_full_listener.go @@ -1,10 +1,10 @@ -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" diff --git a/pkg/infrastructure/ast/ast_java/java_full_listener_test.go b/pkg/infrastructure/ast/ast_java/java_full_listener_test.go new file mode 100644 index 0000000..062c83f --- /dev/null +++ b/pkg/infrastructure/ast/ast_java/java_full_listener_test.go @@ -0,0 +1 @@ +package ast_java diff --git a/pkg/infrastructure/ast/identifier/java_identifier_listener.go b/pkg/infrastructure/ast/ast_java/java_identify/java_identifier_listener.go similarity index 94% rename from pkg/infrastructure/ast/identifier/java_identifier_listener.go rename to pkg/infrastructure/ast/ast_java/java_identify/java_identifier_listener.go index ae69968..49a93a5 100644 --- a/pkg/infrastructure/ast/identifier/java_identifier_listener.go +++ b/pkg/infrastructure/ast/ast_java/java_identify/java_identifier_listener.go @@ -1,10 +1,10 @@ -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), ¤tMethod) + common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), ¤tMethod) } 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), ¤tMethod) + common_listener.BuildAnnotationForMethod(ctx.GetParent().GetParent().GetChild(0).(*parser.ModifierContext), ¤tMethod) } 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) } } diff --git a/pkg/infrastructure/ast/java_process_helper.go b/pkg/infrastructure/ast/ast_java/java_process_helper.go similarity index 96% rename from pkg/infrastructure/ast/java_process_helper.go rename to pkg/infrastructure/ast/ast_java/java_process_helper.go index fb80c74..863f2c0 100644 --- a/pkg/infrastructure/ast/java_process_helper.go +++ b/pkg/infrastructure/ast/ast_java/java_process_helper.go @@ -1,4 +1,4 @@ -package ast +package ast_java import ( "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/pyast/python_ident_listener.go b/pkg/infrastructure/ast/ast_python/python_ident_listener.go similarity index 96% rename from pkg/infrastructure/ast/pyast/python_ident_listener.go rename to pkg/infrastructure/ast/ast_python/python_ident_listener.go index 467cf02..4f0876d 100644 --- a/pkg/infrastructure/ast/pyast/python_ident_listener.go +++ b/pkg/infrastructure/ast/ast_python/python_ident_listener.go @@ -1,11 +1,11 @@ -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 diff --git a/pkg/infrastructure/ast/sql/sql_identifier_listener.go b/pkg/infrastructure/ast/ast_sql/sql_identifier_listener.go similarity index 98% rename from pkg/infrastructure/ast/sql/sql_identifier_listener.go rename to pkg/infrastructure/ast/ast_sql/sql_identifier_listener.go index beea23f..cb9ffac 100644 --- a/pkg/infrastructure/ast/sql/sql_identifier_listener.go +++ b/pkg/infrastructure/ast/ast_sql/sql_identifier_listener.go @@ -1,4 +1,4 @@ -package sql +package ast_sql import ( "fmt" diff --git a/pkg/infrastructure/ast/ts/typescript_ident_converter.go b/pkg/infrastructure/ast/ast_typescript/typescript_ident_converter.go similarity index 94% rename from pkg/infrastructure/ast/ts/typescript_ident_converter.go rename to pkg/infrastructure/ast/ast_typescript/typescript_ident_converter.go index 18e1733..f4e0866 100644 --- a/pkg/infrastructure/ast/ts/typescript_ident_converter.go +++ b/pkg/infrastructure/ast/ast_typescript/typescript_ident_converter.go @@ -1,10 +1,10 @@ -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() diff --git a/pkg/infrastructure/ast/ts/typescript_ident_listener.go b/pkg/infrastructure/ast/ast_typescript/typescript_ident_listener.go similarity index 98% rename from pkg/infrastructure/ast/ts/typescript_ident_listener.go rename to pkg/infrastructure/ast/ast_typescript/typescript_ident_listener.go index 00c4195..e4c6981 100644 --- a/pkg/infrastructure/ast/ts/typescript_ident_listener.go +++ b/pkg/infrastructure/ast/ast_typescript/typescript_ident_listener.go @@ -1,10 +1,10 @@ -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{} diff --git a/pkg/infrastructure/ast/ast_util/pare_tree_util.go b/pkg/infrastructure/ast/astutil/pare_tree_util.go similarity index 96% rename from pkg/infrastructure/ast/ast_util/pare_tree_util.go rename to pkg/infrastructure/ast/astutil/pare_tree_util.go index 2402c70..415f4f1 100644 --- a/pkg/infrastructure/ast/ast_util/pare_tree_util.go +++ b/pkg/infrastructure/ast/astutil/pare_tree_util.go @@ -1,4 +1,4 @@ -package ast_util +package astutil import "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/ast_util/position.go b/pkg/infrastructure/ast/astutil/position.go similarity index 96% rename from pkg/infrastructure/ast/ast_util/position.go rename to pkg/infrastructure/ast/astutil/position.go index 2ede4b2..6f9336a 100644 --- a/pkg/infrastructure/ast/ast_util/position.go +++ b/pkg/infrastructure/ast/astutil/position.go @@ -1,4 +1,4 @@ -package ast_util +package astutil import ( "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/bs/bad_smell_listener.go b/pkg/infrastructure/ast/bs_java/bad_smell_listener.go similarity index 99% rename from pkg/infrastructure/ast/bs/bad_smell_listener.go rename to pkg/infrastructure/ast/bs_java/bad_smell_listener.go index 6a0917c..c09c4b9 100644 --- a/pkg/infrastructure/ast/bs/bad_smell_listener.go +++ b/pkg/infrastructure/ast/bs_java/bad_smell_listener.go @@ -1,4 +1,4 @@ -package bs +package bs_java import ( "github.com/antlr/antlr4/runtime/Go/antlr" diff --git a/pkg/infrastructure/ast/full/java_full_listener_test.go b/pkg/infrastructure/ast/full/java_full_listener_test.go deleted file mode 100644 index 4dbf481..0000000 --- a/pkg/infrastructure/ast/full/java_full_listener_test.go +++ /dev/null @@ -1 +0,0 @@ -package full -- GitLab