feat(#3742): remove redundant package

objectionary · Dec 24, 2024 · 86a2091 · 86a2091
1 parent 57b9a5c
commit 86a2091
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 74 deletions.
diff --git a/...olang/parser/errors/DrEoParserErrors.java → ...a/org/eolang/parser/DrEoParserErrors.java b/...olang/parser/errors/DrEoParserErrors.java → ...a/org/eolang/parser/DrEoParserErrors.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -35,15 +35,13 @@
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.Token;
 import org.cactoos.Text;
-import org.eolang.parser.EoParser;
-import org.eolang.parser.ParsingException;
 import org.xembly.Directive;
 
 /**
  * Accumulates all parsing errors related to EO parser.
  * @since 0.50
  */
-public final class DrEoParserErrors extends BaseErrorListener implements Iterable<Directive> {
+final class DrEoParserErrors extends BaseErrorListener implements Iterable<Directive> {
 
     /**
      * Errors accumulated.
@@ -59,7 +57,7 @@ public final class DrEoParserErrors extends BaseErrorListener implements Iterabl
      * Ctor.
      * @param src The source in lines
      */
-    public DrEoParserErrors(final List<Text> src) {
+    DrEoParserErrors(final List<Text> src) {
         this(new ArrayList<>(0), new Lines(src));
     }
 

diff --git a/...va/org/eolang/parser/errors/DrErrors.java → ...main/java/org/eolang/parser/DrErrors.java b/...va/org/eolang/parser/errors/DrErrors.java → ...main/java/org/eolang/parser/DrErrors.java
@@ -21,12 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.Iterator;
 import java.util.List;
 import org.cactoos.iterable.Mapped;
-import org.eolang.parser.ParsingException;
 import org.xembly.Directive;
 import org.xembly.Directives;
 

diff --git a/...eolang/parser/errors/DrParsingErrors.java → ...va/org/eolang/parser/DrParsingErrors.java b/...eolang/parser/errors/DrParsingErrors.java → ...va/org/eolang/parser/DrParsingErrors.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -31,15 +31,14 @@
 import org.antlr.v4.runtime.Recognizer;
 import org.cactoos.Text;
 import org.cactoos.list.ListOf;
-import org.eolang.parser.ParsingException;
 import org.xembly.Directive;
 
 /**
  * Accumulates all parsing errors.
  *
  * @since 0.30.0
  */
-public final class DrParsingErrors extends BaseErrorListener implements Iterable<Directive> {
+final class DrParsingErrors extends BaseErrorListener implements Iterable<Directive> {
 
     /**
      * Errors accumulated.
@@ -55,15 +54,15 @@ public final class DrParsingErrors extends BaseErrorListener implements Iterable
      * Ctor.
      * @param lines The source in lines
      */
-    public DrParsingErrors(final Text... lines) {
+    DrParsingErrors(final Text... lines) {
         this(new ListOf<>(lines));
     }
 
     /**
      * Ctor.
      * @param src The source in lines
      */
-    public DrParsingErrors(final List<Text> src) {
+    DrParsingErrors(final List<Text> src) {
         this(new ArrayList<>(0), new Lines(src));
     }
 

diff --git a/eo-parser/src/main/java/org/eolang/parser/EoSyntax.java b/eo-parser/src/main/java/org/eolang/parser/EoSyntax.java
@@ -38,8 +38,6 @@
 import org.cactoos.text.Joined;
 import org.cactoos.text.Split;
 import org.cactoos.text.TextOf;
-import org.eolang.parser.errors.DrEoParserErrors;
-import org.eolang.parser.errors.DrParsingErrors;
 import org.xembly.Directives;
 import org.xembly.Xembler;
 

diff --git a/.../java/org/eolang/parser/errors/Lines.java → ...rc/main/java/org/eolang/parser/Lines.java b/.../java/org/eolang/parser/errors/Lines.java → ...rc/main/java/org/eolang/parser/Lines.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/eo-parser/src/main/java/org/eolang/parser/PhiSyntax.java b/eo-parser/src/main/java/org/eolang/parser/PhiSyntax.java
@@ -32,7 +32,6 @@
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.cactoos.Text;
 import org.cactoos.io.InputStreamOf;
-import org.eolang.parser.errors.DrParsingErrors;
 import org.xembly.Directive;
 import org.xembly.Directives;
 import org.xembly.Xembler;

diff --git a/...lang/parser/errors/UnderlinedMessage.java → .../org/eolang/parser/UnderlinedMessage.java b/...lang/parser/errors/UnderlinedMessage.java → .../org/eolang/parser/UnderlinedMessage.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.Collections;
 

diff --git a/eo-parser/src/main/java/org/eolang/parser/errors/package-info.java b/eo-parser/src/main/java/org/eolang/parser/errors/package-info.java
diff --git a/.../parser/errors/UnderlinedMessageTest.java → .../eolang/parser/UnderlinedMessageTest.java b/.../parser/errors/UnderlinedMessageTest.java → .../eolang/parser/UnderlinedMessageTest.java
@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.eolang.parser.errors;
+package org.eolang.parser;
 
 import java.util.stream.Stream;
+import org.eolang.parser.errors.UnderlinedMessage;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.params.ParameterizedTest;

diff --git a/eo-parser/src/test/java/org/eolang/parser/errors/package-info.java b/eo-parser/src/test/java/org/eolang/parser/errors/package-info.java