Merge pull request #3586 from objectionary/3585

XSD versioning mechanism added
objectionary · Dec 2, 2024 · 30cbae2 · 30cbae2
2 parents c2b465c + 31e7a8d
commit 30cbae2
Show file tree

Hide file tree

Showing 62 changed files with 536 additions and 539 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java
@@ -46,7 +46,6 @@
 import org.cactoos.text.TextOf;
 import org.eolang.maven.footprint.Saved;
 import org.eolang.maven.util.Walk;
-import org.eolang.parser.Schema;
 import org.eolang.parser.StUnhex;
 import org.eolang.parser.TrParsing;
 
@@ -156,7 +155,6 @@ private int translate(final Path xmir, final Xsline xsline, final int position,
             position, total, xmir, xmir.toFile().length()
         );
         final XML xml = new XMLDocument(new TextOf(xmir).asString());
-        new Schema(xml).check();
         final Path relative = Paths.get(
             this.phiInputDir.toPath().relativize(xmir).toString().replace(
                 String.format(".%s", AssembleMojo.XMIR),

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
@@ -40,10 +40,7 @@
 import org.eolang.maven.util.HmBase;
 import org.eolang.maven.util.Home;
 import org.eolang.maven.util.Walk;
-import org.eolang.parser.Schema;
-import org.eolang.parser.xmir.Xmir;
-import org.eolang.parser.xmir.XmirReversed;
-import org.eolang.parser.xmir.XmirSwap;
+import org.eolang.parser.Xmir;
 
 /**
  * Print XMIR to EO.
@@ -101,15 +98,13 @@ void exec() throws IOException {
                                 .replace(".xmir", ".eo")
                         );
                         final XML xml = new XMLDocument(new TextOf(source).asString());
-                        new Schema(xml).check();
-                        home.save(
-                            new XmirSwap(
-                                this.printReversed,
-                                new XmirReversed(xml),
-                                new Xmir.Default(xml)
-                            ).toEO(),
-                            relative
-                        );
+                        final String program;
+                        if (this.printReversed) {
+                            program = new Xmir(xml).toReversed();
+                        } else {
+                            program = new Xmir(xml).toEO();
+                        }
+                        home.save(program, relative);
                         Logger.info(
                             this,
                             "Printed: %[file]s (%[size]s) => %[file]s (%[size]s)",

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
@@ -54,15 +54,15 @@ public final class OptTrain implements Optimization {
     static final Train<Shift> DEFAULT_TRAIN = new TrFast(
         new TrLambda(
             new TrClasspath<>(
-                new TrDefault<>(),
                 "/org/eolang/parser/optimize/globals-to-abstracts.xsl",
                 "/org/eolang/parser/optimize/remove-refs.xsl",
                 "/org/eolang/parser/optimize/abstracts-float-up.xsl",
                 "/org/eolang/parser/optimize/remove-levels.xsl",
                 "/org/eolang/parser/add-refs.xsl",
                 "/org/eolang/parser/optimize/fix-missed-names.xsl",
                 "/org/eolang/parser/add-refs.xsl",
-                "/org/eolang/parser/set-locators.xsl"
+                "/org/eolang/parser/set-locators.xsl",
+                "/org/eolang/parser/blank-xsd-schema.xsl"
             ).back(),
             StEoLogged::new
         ),

diff --git a/eo-maven-plugin/src/main/resources/log4j.properties b/eo-maven-plugin/src/main/resources/log4j.properties
@@ -30,5 +30,5 @@ log4j.logger.org.eolang=INFO
 log4j.logger.com.yegor256.xsline=INFO
 log4j.logger.org.eolang.parser.EoSyntax=INFO
 log4j.logger.org.eolang.parser.Scenario=INFO
-log4j.logger.org.eolang.parser.xmir.XmirTest=INFO
+log4j.logger.org.eolang.parser.XmirTest=INFO
 log4j.logger.org.eolang.maven.SodgMojo=TRACE
diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/ShakeMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/ShakeMojoTest.java
@@ -71,14 +71,14 @@ void shakesSuccessfully(@Mktmp final Path temp) throws IOException {
             .execute(new FakeMaven.Shake())
             .result();
         MatcherAssert.assertThat(
-            "After successful operation of the ShakeMojo, a xml should appear.",
+            "After successful operation of the ShakeMojo, an XML should appear",
             res,
             Matchers.hasKey(
                 String.format("target/%s/foo/x/main/01-remove-refs.xml", ShakeMojo.STEPS)
             )
         );
         MatcherAssert.assertThat(
-            "After successful operation of the ShakeMojo, a xmir should appear.",
+            "After successful operation of the ShakeMojo, an XMIR should appear",
             res,
             Matchers.hasKey(
                 String.format(this.key, ShakeMojo.DIR, AssembleMojo.XMIR)

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-maven-plugin/src/test/resources/org/eolang/maven/packs/as-type-optimization.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/as-type-optimization.yaml
@@ -31,6 +31,7 @@ xsls:
   - /org/eolang/parser/add-refs.xsl
   - /org/eolang/parser/add-default-package.xsl
   - /org/eolang/parser/optimize/constant-folding.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //o[@base='org.eolang.bool' and o[@base='org.eolang.bytes' and text()='01-']]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/bindings-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/bindings-to-java.yaml
@@ -26,6 +26,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java/text()[contains(., 'new PhWith(ret, 0')]

diff --git a/...in/src/test/resources/org/eolang/maven/packs/converts-to-java-with-arrays-and-scopes.yaml b/...in/src/test/resources/org/eolang/maven/packs/converts-to-java-with-arrays-and-scopes.yaml
@@ -48,6 +48,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/data-as-bytes.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/data-as-bytes.yaml
@@ -27,6 +27,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), '.take("org").take("eolang").take("true")')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/embedded-class.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/embedded-class.yaml
@@ -33,6 +33,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), 'PhMethod(new PhMethod(rho, "ρ"), "ρ")')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/locators-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/locators-to-java.yaml
@@ -29,6 +29,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), 'new PhLocated(ret, 3, 2, "Φ.foo.φ")')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/long-class-name.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/long-class-name.yaml
@@ -27,6 +27,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), 'public final class EOtest$EOblah0$EOblah1$EO89_58 extends PhDefault')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/set-package.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/set-package.yaml
@@ -23,6 +23,7 @@
 xsls:
   - /org/eolang/maven/pre/classes.xsl
   - /org/eolang/maven/pre/package.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //class[@name='bar' and @package='foo.long-name']

diff --git a/...n-plugin/src/test/resources/org/eolang/maven/packs/synthetic-attributes-with-to-java.yaml b/...n-plugin/src/test/resources/org/eolang/maven/packs/synthetic-attributes-with-to-java.yaml
@@ -48,6 +48,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/test-object-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/test-object-to-java.yaml
@@ -26,6 +26,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), '  @Test')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tests-moving-inside.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tests-moving-inside.yaml
@@ -28,6 +28,7 @@ xsls:
   - /org/eolang/maven/pre/align-test-classes.xsl
   - /org/eolang/maven/pre/remove-high-level-inner-classes.xsl
   - /org/eolang/maven/pre/rename-tests-inners.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - /program/objects[count(class)=1]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tests-test.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tests-test.yaml
@@ -33,6 +33,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), '@Test')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tuple-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/tuple-to-java.yaml
@@ -30,6 +30,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), 'Phi ret = Phi.Φ.take("org").take("eolang").take("tuple");')]

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/underscore-to-java.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/packs/underscore-to-java.yaml
@@ -26,6 +26,7 @@ xsls:
   - /org/eolang/maven/pre/attrs.xsl
   - /org/eolang/maven/pre/data.xsl
   - /org/eolang/maven/pre/to-java.xsl
+  - /org/eolang/parser/blank-xsd-schema.xsl
 tests:
   - /program[not(errors)]
   - //java[contains(text(), 'public final class EOfoo__underscore extends PhDefault')]

diff --git a/eo-parser/src/main/java/org/eolang/parser/BytesToHex.java b/eo-parser/src/main/java/org/eolang/parser/BytesToHex.java
@@ -32,7 +32,7 @@
  *
  * @since 0.44
  */
-public final class BytesToHex implements Supplier<String> {
+final class BytesToHex implements Supplier<String> {
 
     /**
      * The bytes.
@@ -43,7 +43,7 @@ public final class BytesToHex implements Supplier<String> {
      * Ctor.
      * @param bts Bytes
      */
-    public BytesToHex(final byte[] bts) {
+    BytesToHex(final byte[] bts) {
         this.bytes = Arrays.copyOf(bts, bts.length);
     }
 

diff --git a/eo-parser/src/main/java/org/eolang/parser/CheckPack.java b/eo-parser/src/main/java/org/eolang/parser/CheckPack.java
@@ -24,6 +24,7 @@
 package org.eolang.parser;
 
 import com.jcabi.log.Logger;
+import com.jcabi.xml.StrictXML;
 import com.jcabi.xml.XML;
 import com.yegor256.xsline.Shift;
 import com.yegor256.xsline.StClasspath;
@@ -78,11 +79,15 @@ public Collection<String> failures() throws IOException {
                 train = train.with(new StClasspath(xsl));
             }
         }
-        final XML out = new Xsline(train).pass(
-            new EoSyntax(
-                "scenario",
-                new InputOf(String.format("%s\n", src))
-            ).parsed()
+        final XML out = new StrictXML(
+            new Xsline(train).pass(
+                new StrictXML(
+                    new EoSyntax(
+                        "scenario",
+                        new InputOf(String.format("%s\n", src))
+                    ).parsed()
+                )
+            )
         );
         Logger.debug(this, "Output XML:\n%s", out);
         final Collection<String> failures = new LinkedList<>();

diff --git a/...in/java/org/eolang/parser/SourceText.java → ...ain/java/org/eolang/parser/DrListing.java b/...in/java/org/eolang/parser/SourceText.java → ...ain/java/org/eolang/parser/DrListing.java
@@ -23,14 +23,19 @@
  */
 package org.eolang.parser;
 
+import java.util.Iterator;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.misc.Interval;
+import org.xembly.Directive;
+import org.xembly.Directives;
 
 /**
  * Source text of parser context.
+ *
  * @since 0.34.0
  */
-public final class SourceText {
+final class DrListing implements Iterable<Directive> {
+
     /**
      * Context.
      */
@@ -40,17 +45,22 @@ public final class SourceText {
      * Ctor.
      * @param ctx Context
      */
-    public SourceText(final ParserRuleContext ctx) {
+    DrListing(final ParserRuleContext ctx) {
         this.context = ctx;
     }
 
     @Override
-    public String toString() {
-        return this.context.getStart().getInputStream().getText(
+    public Iterator<Directive> iterator() {
+        final String text = this.context.getStart().getInputStream().getText(
             new Interval(
                 this.context.getStart().getStartIndex(),
                 this.context.getStop().getStopIndex()
             )
         );
+        return new Directives()
+            .xpath("/program")
+            .strict(1).add("listing")
+            .set(text)
+            .iterator();
     }
 }