Merge pull request #3867 from maxonfjvipon/bug/#3845/roll-bases

bug(#3845): introduced `roll-bases.xsl`
objectionary · Jan 29, 2025 · 710f776 · 710f776 · 0pdd · Jan 29, 2025
2 parents 3609908 + 41aabd7
commit 710f776
Show file tree

Hide file tree

Showing 274 changed files with 1,561 additions and 1,492 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/AssembleMojo.java
@@ -235,7 +235,6 @@ public void exec() {
         final Moja<?>[] mojas = {
             new Moja<>(ParseMojo.class),
             new Moja<>(ShakeMojo.class),
-            new Moja<>(DiscoverMojo.class),
             new Moja<>(ProbeMojo.class),
             new Moja<>(PullMojo.class),
             new Moja<>(ResolveMojo.class),

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PrintMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PrintMojo.java
@@ -24,7 +24,6 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
-import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
 import java.io.File;
 import java.io.IOException;
@@ -72,17 +71,6 @@ public final class PrintMojo extends SafeMojo {
     )
     private File printOutputDir;
 
-    /**
-     * Print EO in reversed notation.
-     * @checkstyle MemberNameCheck (10 lines)
-     */
-    @Parameter(
-        property = "eo.printReversed",
-        required = true,
-        defaultValue = "false"
-    )
-    private boolean printReversed;
-
     @Override
     void exec() throws IOException {
         final Home home = new HmBase(this.printOutputDir);
@@ -93,13 +81,9 @@ void exec() throws IOException {
                     this.printSourcesDir.toPath().relativize(source).toString()
                         .replace(".xmir", ".eo")
                 );
-                final XML xml = new XMLDocument(new TextOf(source).asString());
-                final String program;
-                if (this.printReversed) {
-                    program = new Xmir(xml).toReversedEO();
-                } else {
-                    program = new Xmir(xml).toEO();
-                }
+                final String program = new Xmir(
+                    new XMLDocument(new TextOf(source).asString())
+                ).toEO();
                 home.save(program, relative);
                 Logger.info(
                     this,

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ProbeMojo.java
@@ -137,10 +137,7 @@ private void probe() throws IOException {
                 );
             }
         } else if (probed.isEmpty()) {
-            Logger.debug(
-                this, "No probes found in %d programs",
-                tojos.size()
-            );
+            Logger.info(this, "No probes found in %d programs", tojos.size());
         } else {
             Logger.info(
                 this, "Found %d probe(s) in %d program(s) in %[ms]s: %s",

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/TrShaking.java b/eo-maven-plugin/src/main/java/org/eolang/maven/TrShaking.java
@@ -40,17 +40,9 @@ final class TrShaking extends TrEnvelope {
         super(
             new TrFull(
                 new TrClasspath<>(
-                    "/org/eolang/parser/shake/cti-adds-errors.xsl",
-                    "/org/eolang/parser/shake/vars-float-up.xsl",
-                    "/org/eolang/parser/shake/build-fqns.xsl",
-                    "/org/eolang/parser/shake/expand-qqs.xsl",
-                    "/org/eolang/parser/shake/add-probes.xsl",
-                    "/org/eolang/parser/shake/expand-aliases.xsl",
-                    "/org/eolang/parser/shake/resolve-aliases.xsl",
-                    "/org/eolang/parser/shake/add-default-package.xsl",
-                    "/org/eolang/parser/shake/explicit-data.xsl",
-                    "/org/eolang/parser/shake/set-locators.xsl",
-                    "/org/eolang/parser/shake/blank-xsd-schema.xsl"
+                    "/org/eolang/maven/shake/cti-adds-errors.xsl",
+                    "/org/eolang/maven/shake/add-probes.xsl",
+                    "/org/eolang/maven/shake/set-locators.xsl"
                 ).back()
             )
         );

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java
@@ -196,16 +196,6 @@ public ForeignTojo withJar(final Coordinates coordinates) {
         return this;
     }
 
-    /**
-     * Set the discovered size.
-     * @param size The size.
-     * @return The tojo itself.
-     */
-    public ForeignTojo withDiscovered(final int size) {
-        this.delegate.set(ForeignTojos.Attribute.DISCOVERED.getKey(), Integer.valueOf(size));
-        return this;
-    }
-
     /**
      * Set the discovered at.
      * @param path The path where was discovered.

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java b/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojos.java
@@ -133,18 +133,6 @@ public ForeignTojo find(final String id) {
         );
     }
 
-    /**
-     * Get the tojos that are not discovered yet.
-     * @return The tojos.
-     */
-    public Collection<ForeignTojo> notDiscovered() {
-        return this.select(
-            row ->
-                row.exists(Attribute.SHAKEN.getKey())
-                && !row.exists(Attribute.DISCOVERED.getKey())
-        );
-    }
-
     /**
      * Get the tojos that have corresponding xmir.
      * @return The tojos.
@@ -245,7 +233,6 @@ public String status() {
             Attribute.EO,
             Attribute.XMIR,
             Attribute.SHAKEN,
-            Attribute.DISCOVERED,
             Attribute.PROBED,
         };
         final Collection<String> parts = new LinkedList<>();
@@ -320,11 +307,6 @@ enum Attribute {
          */
         JAR("jar"),
 
-        /**
-         * In how many EO programs this object was seen (integer).
-         */
-        DISCOVERED("discovered"),
-
         /**
          * Absolute path of the {@code .xmir} file where this object was discovered.
          */