merge

objectionary · Feb 3, 2025 · 0a73f29 · 0a73f29
2 parents ad602cc + 846c44b
commit 0a73f29
Show file tree

Hide file tree

Showing 310 changed files with 2,351 additions and 215,670 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -48,7 +48,7 @@ jobs:
           restore-keys: |
             maven-
       - run: mvn install -Pjacoco
-      - uses: codecov/codecov-action@v4.0.0-beta.3
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./eo-parser/target/site/jacoco/jacoco.xml,./eo-runtime/target/site/jacoco/jacoco.xml,./eo-maven-plugin/target/site/jacoco/jacoco.xml

diff --git a/.github/workflows/ebnf.yml b/.github/workflows/ebnf.yml
@@ -36,8 +36,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          sudo apt-get update
-          sudo apt-get -y install ghostscript imagemagick texlive-extra-utils pdf2svg inkscape
+          sudo apt-get update --yes --fix-missing
+          sudo apt-get install --yes ghostscript imagemagick texlive-extra-utils pdf2svg inkscape
       - uses: teatimeguest/[email protected]
         with:
           update-all-packages: true

diff --git a/.github/workflows/telegram.yml b/.github/workflows/telegram.yml
@@ -38,10 +38,11 @@ jobs:
       - uses: djdefi/cloc-action@7
         with:
           options: --json --report-file=cloc.json
-      - run: sudo apt-get update && sudo apt-get install --yes jq bc
+      - run: sudo apt-get update --yes --fix-missing && sudo apt-get install --yes jq bc
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
+          bundler-cache: true
       - run: gem install hoc
       - run: |
           git fetch --tags --force

diff --git a/.github/workflows/xs3p-tag.yml b/.github/workflows/xs3p-tag.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt-get update && sudo apt-get install -y xsltproc
+      - run: sudo apt-get update --yes --fix-missing && sudo apt-get install --yes xsltproc
       - run: |
           mkdir gh-pages
           xsltproc \

diff --git a/.github/workflows/xs3p.yml b/.github/workflows/xs3p.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt-get update && sudo apt-get install -y xsltproc
+      - run: sudo apt-get update --yes --fix-missing && sudo apt-get install --yes xsltproc
       - run: |
           mkdir gh-pages
           xsltproc \

diff --git a/.github/workflows/zerocracy.yml b/.github/workflows/zerocracy.yml
@@ -34,7 +34,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: zerocracy/[email protected].66
+      - uses: zerocracy/[email protected].67
         with:
           verbose: false
           cycles: 1
@@ -44,7 +44,7 @@ jobs:
           options: |
             vitals_url=https://www.eolang.org/zerocracy/objectionary-vitals.html
           factbase: objectionary.fb
-      - uses: zerocracy/[email protected].40
+      - uses: zerocracy/[email protected].41
         with:
           factbase: objectionary.fb
           output: pages

diff --git a/.rultor.yml b/.rultor.yml
@@ -31,7 +31,7 @@ assets:
   pubring.gpg: yegor256/objectionary-secrets#pubring.gpg
   secring.gpg: yegor256/objectionary-secrets#secring.gpg
 install: |
-  sudo apt-get install -y python3-pygments
+  sudo apt-get install --yes python3-pygments
   sudo pip3 install pygments
   javac -version
   pdd --file=/dev/null

diff --git a/README.md b/README.md
@@ -262,28 +262,28 @@ the `eo-runtime` module:
 <!-- benchmark_begin -->
 
 ```text
-to-java.xsl                 33030  21.68%
-classes.xsl                 14949  9.81%
-set-locators.xsl            11700  7.68%
-build-fqns.xsl              9940   6.52%
-resolve-aliases.xsl         6172   4.05%
-package.xsl                 5906   3.88%
-add-probes.xsl              5795   3.80%
-explicit-data.xsl           5568   3.65%
-attrs.xsl                   5221   3.43%
-add-default-package.xsl     5181   3.40%
-data.xsl                    5136   3.37%
-vars-float-up.xsl           4830   3.17%
-cti-adds-errors.xsl         4610   3.03%
-tests.xsl                   4409   2.89%
-anonymous-to-nested.xsl     4137   2.72%
-expand-aliases.xsl          4133   2.71%
+to-java.xsl              32861  23.09%
+classes.xsl              15303  10.75%
+set-locators.xsl         12365  8.69%
+build-fqns.xsl           10813  7.60%
+package.xsl              6737   4.73%
+resolve-aliases.xsl      6107   4.29%
+add-probes.xsl           5795   4.07%
+explicit-data.xsl        5668   3.98%
+attrs.xsl                5559   3.91%
+data.xsl                 5410   3.80%
+vars-float-up.xsl        5273   3.71%
+add-default-package.xsl  4874   3.42%
+cti-adds-errors.xsl      4839   3.40%
+tests.xsl                4680   3.29%
+anonymous-to-nested.xsl  4462   3.14%
+blank-xsd-schema.xsl     4009   2.82%
 ```
 
 The results were calculated in [this GHA job][benchmark-gha]
-on 2025-01-20 at 17:26,
+on 2025-01-27 at 10:11,
 on Linux with 4 CPUs.
-The total is 152362 milliseconds.
+The total is 142320 milliseconds.
 We show only the first 16 most expensive XSL stylesheets.
 
 <!-- benchmark_end -->
@@ -324,4 +324,4 @@ to enhance the performance of EO components:
 
 [![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com)
 
-[benchmark-gha]: https://github.com/objectionary/eo/actions/runs/12872995680
+[benchmark-gha]: https://github.com/objectionary/eo/actions/runs/12986508714
diff --git a/eo-maven-plugin/README.md b/eo-maven-plugin/README.md
@@ -35,7 +35,7 @@ create a file `pom.xml` with this content (it's just a sample):
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.50.1</version>
+        <version>0.51.0</version>
         <executions>
           <execution>
             <goals>
@@ -142,7 +142,7 @@ To transform your XMIR files, you need to add the following plugin configuration
 <plugin>
   <groupId>org.eolang</groupId>
   <artifactId>eo-maven-plugin</artifactId>
-  <version>0.50.1</version>
+  <version>0.51.0</version>
   <executions>
     <execution>
       <id>xmir-to-phi</id>

diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml
@@ -42,7 +42,7 @@ SOFTWARE.
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>lints</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>0.0.36</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish</groupId>
@@ -142,7 +142,12 @@ SOFTWARE.
     <dependency>
       <groupId>org.twdata.maven</groupId>
       <artifactId>mojo-executor</artifactId>
-      <version>2.4.0</version>
+      <version>2.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <!-- version from parent POM -->
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>

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()
             )
         );