#3585: fixed -rf :eo-maven-plugin

objectionary · Dec 2, 2024 · 4cbdf34 · 4cbdf34
1 parent 7898533
commit 4cbdf34
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/optimization/OptTrain.java b/eo-maven-plugin/src/main/java/org/eolang/maven/optimization/OptTrain.java
@@ -26,7 +26,6 @@
 import com.jcabi.xml.XML;
 import com.yegor256.xsline.Shift;
 import com.yegor256.xsline.StClasspath;
-import com.yegor256.xsline.StSchema;
 import com.yegor256.xsline.TrClasspath;
 import com.yegor256.xsline.TrDefault;
 import com.yegor256.xsline.TrFast;
@@ -55,9 +54,6 @@ public final class OptTrain implements Optimization {
     static final Train<Shift> DEFAULT_TRAIN = new TrFast(
         new TrLambda(
             new TrClasspath<>(
-                new TrDefault<Shift>(
-                    new StSchema()
-                ),
                 "/org/eolang/parser/optimize/globals-to-abstracts.xsl",
                 "/org/eolang/parser/optimize/remove-refs.xsl",
                 "/org/eolang/parser/optimize/abstracts-float-up.xsl",

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/SodgMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/SodgMojoTest.java
@@ -33,6 +33,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -69,6 +70,11 @@ void convertsSimpleObjectToGraph(@Mktmp final Path temp) throws Exception {
         new Farea(temp).together(
             f -> {
                 f.clean();
+                f.files().file("XMIR.xsd").save(
+                    Paths.get(System.getProperty("user.dir")).resolve(
+                        "../eo-parser/src/main/resources/XMIR.xsd"
+                    )
+                );
                 f.files().file("src/main/eo/foo.eo").write(
                     "# This unit test is supposed to check the functionality of the corresponding object.\n[] > foo\n".getBytes()
                 );

diff --git a/eo-parser/src/main/java/org/eolang/parser/DrProgram.java b/eo-parser/src/main/java/org/eolang/parser/DrProgram.java
@@ -61,7 +61,7 @@ public Iterator<Directive> iterator() {
         return new Directives()
             .comment(
                 String.join(
-                    "\n",
+                    "\n  ",
                     "",
                     "This is XMIR, a dialect of XML, which is used to represent a parsed",
                     "EO program. For more information about the XMIR format, please visit",
@@ -110,6 +110,7 @@ private static String schema() {
             Manifests.read("EO-Version")
         );
         final String[] opts = {
+            "XMIR.xsd",
             "src/main/resources/XMIR.xsd",
             "../eo-parser/src/main/resources/XMIR.xsd",
         };

diff --git a/eo-parser/src/main/resources/org/eolang/parser/clean-up.xsl b/eo-parser/src/main/resources/org/eolang/parser/clean-up.xsl
@@ -22,7 +22,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="add-default-package" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" id="clean-up" version="2.0">
   <!--
   Here, we remove all the temporary information XMIR
   that doesn't match the requirements of XSD schema.