From aaa26dab1acc77b60ee66459259a230fb59b79eb Mon Sep 17 00:00:00 2001 From: Gang ZHANG Date: Sun, 11 Sep 2022 15:32:54 +0800 Subject: [PATCH] refactory: included file locator --- .../java/depends/extractor/python/union/PythonCodeListener.java | 2 +- .../java/depends/extractor/python/union/PythonFileParser.java | 2 +- .../java/depends/extractor/python/union/PythonProcessor.java | 2 +- src/main/java/depends/extractor/ruby/RubyHandlerContext.java | 1 + src/main/java/depends/extractor/ruby/RubyProcessor.java | 1 + src/main/java/depends/extractor/ruby/jruby/JRubyFileParser.java | 2 +- src/main/java/depends/extractor/ruby/jruby/JRubyVisitor.java | 2 +- src/test/java/depends/extractor/ruby/RubyParserTest.java | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/depends/extractor/python/union/PythonCodeListener.java b/src/main/java/depends/extractor/python/union/PythonCodeListener.java index 17e4cdd..c536caf 100644 --- a/src/main/java/depends/extractor/python/union/PythonCodeListener.java +++ b/src/main/java/depends/extractor/python/union/PythonCodeListener.java @@ -6,7 +6,7 @@ import depends.extractor.python.NameAliasImport; import depends.extractor.python.PythonHandlerContext; import depends.extractor.python.PythonParser.*; import depends.extractor.python.PythonParserBaseListener; -import depends.extractor.ruby.IncludedFileLocator; +import depends.extractor.IncludedFileLocator; import depends.importtypes.FileImport; import depends.relations.IBindingResolver; import multilang.depends.util.file.FileUtil; diff --git a/src/main/java/depends/extractor/python/union/PythonFileParser.java b/src/main/java/depends/extractor/python/union/PythonFileParser.java index 4759b6d..7c2890b 100644 --- a/src/main/java/depends/extractor/python/union/PythonFileParser.java +++ b/src/main/java/depends/extractor/python/union/PythonFileParser.java @@ -6,7 +6,7 @@ import depends.entity.repo.EntityRepo; import depends.extractor.FileParser; import depends.extractor.python.PythonLexer; import depends.extractor.python.PythonParser; -import depends.extractor.ruby.IncludedFileLocator; +import depends.extractor.IncludedFileLocator; import depends.relations.IBindingResolver; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; diff --git a/src/main/java/depends/extractor/python/union/PythonProcessor.java b/src/main/java/depends/extractor/python/union/PythonProcessor.java index 3f4a832..bc371e2 100644 --- a/src/main/java/depends/extractor/python/union/PythonProcessor.java +++ b/src/main/java/depends/extractor/python/union/PythonProcessor.java @@ -2,7 +2,7 @@ package depends.extractor.python.union; import depends.extractor.FileParser; import depends.extractor.python.BasePythonProcessor; -import depends.extractor.ruby.IncludedFileLocator; +import depends.extractor.IncludedFileLocator; public class PythonProcessor extends BasePythonProcessor { diff --git a/src/main/java/depends/extractor/ruby/RubyHandlerContext.java b/src/main/java/depends/extractor/ruby/RubyHandlerContext.java index d143bb9..1c81790 100644 --- a/src/main/java/depends/extractor/ruby/RubyHandlerContext.java +++ b/src/main/java/depends/extractor/ruby/RubyHandlerContext.java @@ -29,6 +29,7 @@ import depends.entity.PackageEntity; import depends.entity.repo.EntityRepo; import depends.extractor.FileParser; import depends.extractor.HandlerContext; +import depends.extractor.IncludedFileLocator; import depends.extractor.ParserCreator; import depends.importtypes.FileImport; import depends.relations.IBindingResolver; diff --git a/src/main/java/depends/extractor/ruby/RubyProcessor.java b/src/main/java/depends/extractor/ruby/RubyProcessor.java index 16e0d85..a91dad8 100644 --- a/src/main/java/depends/extractor/ruby/RubyProcessor.java +++ b/src/main/java/depends/extractor/ruby/RubyProcessor.java @@ -27,6 +27,7 @@ package depends.extractor.ruby; import depends.entity.repo.BuiltInType; import depends.extractor.AbstractLangProcessor; import depends.extractor.FileParser; +import depends.extractor.IncludedFileLocator; import depends.extractor.ParserCreator; import depends.extractor.ruby.jruby.JRubyFileParser; import depends.relations.ImportLookupStrategy; diff --git a/src/main/java/depends/extractor/ruby/jruby/JRubyFileParser.java b/src/main/java/depends/extractor/ruby/jruby/JRubyFileParser.java index 9390aa4..43d2be8 100644 --- a/src/main/java/depends/extractor/ruby/jruby/JRubyFileParser.java +++ b/src/main/java/depends/extractor/ruby/jruby/JRubyFileParser.java @@ -29,7 +29,7 @@ import depends.entity.FileEntity; import depends.entity.repo.EntityRepo; import depends.extractor.FileParser; import depends.extractor.ParserCreator; -import depends.extractor.ruby.IncludedFileLocator; +import depends.extractor.IncludedFileLocator; import depends.relations.IBindingResolver; import multilang.depends.util.file.FileUtil; import org.antlr.v4.runtime.CharStream; diff --git a/src/main/java/depends/extractor/ruby/jruby/JRubyVisitor.java b/src/main/java/depends/extractor/ruby/jruby/JRubyVisitor.java index 019612e..1db61ec 100644 --- a/src/main/java/depends/extractor/ruby/jruby/JRubyVisitor.java +++ b/src/main/java/depends/extractor/ruby/jruby/JRubyVisitor.java @@ -27,7 +27,7 @@ package depends.extractor.ruby.jruby; import depends.entity.*; import depends.entity.repo.EntityRepo; import depends.extractor.ParserCreator; -import depends.extractor.ruby.IncludedFileLocator; +import depends.extractor.IncludedFileLocator; import depends.extractor.ruby.RubyHandlerContext; import depends.relations.IBindingResolver; import org.jrubyparser.ast.*; diff --git a/src/test/java/depends/extractor/ruby/RubyParserTest.java b/src/test/java/depends/extractor/ruby/RubyParserTest.java index 665ab97..e9dc053 100644 --- a/src/test/java/depends/extractor/ruby/RubyParserTest.java +++ b/src/test/java/depends/extractor/ruby/RubyParserTest.java @@ -1,6 +1,7 @@ package depends.extractor.ruby; import depends.extractor.FileParser; +import depends.extractor.IncludedFileLocator; import depends.extractor.ParserCreator; import depends.extractor.ParserTest; import depends.extractor.ruby.jruby.JRubyFileParser;