Merge branch 'master' into fix/objectionary#2930/simplify-phi-grammar

maxonfjvipon · Mar 12, 2024 · 633908b · 633908b
2 parents e64f050 + d1249b2
commit 633908b
Show file tree

Hide file tree

Showing 57 changed files with 333 additions and 174 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/ebnf.yml b/.github/workflows/ebnf.yml
@@ -17,7 +17,7 @@ jobs:
       - run: |
           sudo apt-get update
           sudo apt-get -y install ghostscript imagemagick texlive-extra-utils pdf2svg inkscape
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
@@ -15,5 +15,5 @@ jobs:
   markdown-lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@b32f140b0c872d58512e0a66172253c302617b90
+      - uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694
       - uses: articulate/actions-markdownlint@v1
diff --git a/.github/workflows/simian.yml b/.github/workflows/simian.yml
@@ -24,4 +24,4 @@ jobs:
       - run: |
           wget --quiet http://public.yegor256.com/simian.jar -O /tmp/simian.jar
       - run: |
-          java -jar /tmp/simian.jar -threshold=25 -excludes=**/gen -excludes=**/it **/*.java
+          java -jar /tmp/simian.jar -threshold=16 -excludes=**/gen -excludes=**/it **/*.java
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0
-      - uses: teatimeguest/setup-texlive-action@v3.0.2
+      - uses: teatimeguest/setup-texlive-action@v3.1.0
         with:
           update-all-packages: true
           packages: scheme-basic geometry xcolor naive-ebnf microtype etoolbox

diff --git a/eo-maven-plugin/pom.xml b/eo-maven-plugin/pom.xml
@@ -286,7 +286,6 @@ SOFTWARE.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <excludedGroups>slow</excludedGroups>
           <argLine>@{argLine} -Xss${stack-size}</argLine>
           <systemPropertyVariables>
             <runtime.path>${project.basedir}/../eo-runtime</runtime.path>
@@ -490,13 +489,6 @@ SOFTWARE.
               </excludes>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludedGroups>nothing-to-exclude</excludedGroups>
-            </configuration>
-          </plugin>
           <plugin>
             <groupId>com.github.volodya-lombrozo</groupId>
             <artifactId>jtcop-maven-plugin</artifactId>

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
@@ -113,17 +113,17 @@ public final class AssembleMojo extends SafeMojo {
 
     /**
      * Pull again even if the .eo file is already present?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.10.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.overWrite", required = true, defaultValue = "false")
     private boolean overWrite;
 
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")
@@ -139,25 +139,25 @@ public final class AssembleMojo extends SafeMojo {
 
     /**
      * Skip artifact with the version 0.0.0.
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.9.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.skipZeroVersions", required = true, defaultValue = "true")
     private boolean skipZeroVersions;
 
     /**
      * Shall we discover JAR artifacts for .EO sources?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.12.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.discoverSelf", required = true, defaultValue = "false")
     private boolean discoverSelf;
 
     /**
      * Fail resolution process on conflicting dependencies.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 1.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.ignoreVersionConflicts", required = true, defaultValue = "false")
     @SuppressWarnings("PMD.LongVariable")
@@ -196,9 +196,9 @@ public final class AssembleMojo extends SafeMojo {
     /**
      * If set to TRUE, the exception on exit will be printed in details
      * to the log.
+     * @since 0.29.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.29.0
      */
     @Parameter(property = "eo.unrollExitError")
     @SuppressWarnings("PMD.ImmutableField")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeMojo.java
@@ -39,8 +39,8 @@
 /**
  * Compile binaries.
  *
- * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @since 0.1
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @Mojo(
     name = "binarize",

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeParse.java b/eo-maven-plugin/src/main/java/org/eolang/maven/BinarizeParse.java
@@ -50,8 +50,8 @@
 /**
  * Parse rust inserts.
  *
- * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  * @since 0.1
+ * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 @SuppressWarnings("PMD.LongVariable")
 public final class BinarizeParse {

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/DemandMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/DemandMojo.java
@@ -44,8 +44,8 @@ public final class DemandMojo extends SafeMojo {
 
     /**
      * List of object names to add.
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.17.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(required = true)
     private List<String> objects;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/OptimizeMojo.java
@@ -78,8 +78,8 @@ public final class OptimizeMojo extends SafeMojo {
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java
@@ -49,8 +49,8 @@
  * Take binary files from where ResolveMojo placed them and
  * copy to target/classes.
  *
- * @since 0.11
  * @see <a href="https://news.eolang.org/2022-10-19-placed-catalog.html">Place catalog</a>
+ * @since 0.11
  */
 @Mojo(
     name = "place",

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java
@@ -87,8 +87,8 @@ public final class PullMojo extends SafeMojo {
 
     /**
      * Pull again even if the .eo file is already present?
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.10.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.overWrite", required = true, defaultValue = "false")
     private boolean overWrite;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java
@@ -69,26 +69,26 @@ public final class ResolveMojo extends SafeMojo {
     /**
      * Skip artifact with the version 0.0.0.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.9.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.skipZeroVersions", required = true, defaultValue = "true")
     private boolean skipZeroVersions;
 
     /**
      * Shall we discover JAR artifacts for .EO sources?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.12.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.discoverSelf", required = true, defaultValue = "false")
     private boolean discoverSelf;
 
     /**
      * Fail resolution process on conflicting dependencies.
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 1.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @Parameter(property = "eo.ignoreVersionConflicts", required = true, defaultValue = "false")
     @SuppressWarnings("PMD.LongVariable")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/SafeMojo.java
@@ -123,9 +123,9 @@ abstract class SafeMojo extends AbstractMojo {
     /**
      * The path to a text file where paths of all added
      * .class (and maybe others) files are placed.
+     * @since 0.11.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.11.0
      */
     @Parameter(
         property = "eo.placed",
@@ -144,9 +144,9 @@ abstract class SafeMojo extends AbstractMojo {
 
     /**
      * The path to a text file where paths of generated java files per EO program.
+     * @since 0.11.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.11.0
      */
     @Parameter(
         property = "eo.transpiled",
@@ -157,8 +157,8 @@ abstract class SafeMojo extends AbstractMojo {
 
     /**
      * Mojo execution timeout in seconds.
-     * @checkstyle VisibilityModifierCheck (10 lines)
      * @since 0.28.12
+     * @checkstyle VisibilityModifierCheck (10 lines)
      */
     @Parameter(property = "eo.timeout")
     protected Integer timeout = Integer.MAX_VALUE;
@@ -174,9 +174,9 @@ abstract class SafeMojo extends AbstractMojo {
     /**
      * If set to TRUE, the exception on exit will be printed in details
      * to the log.
+     * @since 0.29.0
      * @checkstyle MemberNameCheck (7 lines)
      * @checkstyle VisibilityModifierCheck (10 lines)
-     * @since 0.29.0
      */
     @Parameter(property = "eo.unrollExitError")
     protected boolean unrollExitError = true;

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/ShakeMojo.java
@@ -75,8 +75,8 @@ public final class ShakeMojo extends SafeMojo {
     /**
      * Track optimization steps into intermediate XML files?
      *
-     * @checkstyle MemberNameCheck (7 lines)
      * @since 0.24.0
+     * @checkstyle MemberNameCheck (7 lines)
      */
     @SuppressWarnings("PMD.LongVariable")
     @Parameter(property = "eo.trackOptimizationSteps", required = true, defaultValue = "false")

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/UnphiMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/UnphiMojo.java
@@ -30,18 +30,24 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.cactoos.experimental.Threads;
+import org.cactoos.iterable.IterableEnvelope;
+import org.cactoos.iterable.Joined;
 import org.cactoos.iterable.Mapped;
 import org.cactoos.list.ListOf;
 import org.cactoos.number.SumOf;
+import org.cactoos.set.SetOf;
 import org.cactoos.text.TextOf;
 import org.eolang.maven.util.HmBase;
 import org.eolang.maven.util.Home;
 import org.eolang.maven.util.Walk;
 import org.eolang.parser.PhiSyntax;
+import org.xembly.Directive;
+import org.xembly.Directives;
 
 /**
  * Read PHI files and parse them to the XMIR.
@@ -75,10 +81,19 @@ public final class UnphiMojo extends SafeMojo {
     )
     private File unphiOutputDir;
 
+    /**
+     * Extra metas to add to unphied XMIR.
+     * @checkstyle MemberNameCheck (10 lines)
+     */
+    @SuppressWarnings("PMD.ImmutableField")
+    @Parameter(property = "eo.unphiMetas")
+    private Set<String> unphiMetas = new SetOf<>();
+
     @Override
     public void exec() {
         final List<Path> errors = new ListOf<>();
         final Home home = new HmBase(this.unphiOutputDir);
+        final Iterable<Directive> metas = new UnphiMojo.Metas(this.unphiMetas);
         final int count = new SumOf(
             new Threads<>(
                 Runtime.getRuntime().availableProcessors(),
@@ -93,7 +108,8 @@ public void exec() {
                         );
                         final XML parsed = new PhiSyntax(
                             phi.getFileName().toString().replace(".phi", ""),
-                            new TextOf(phi)
+                            new TextOf(phi),
+                            metas
                         ).parsed();
                         home.save(parsed.toString(), xmir);
                         Logger.info(
@@ -121,4 +137,54 @@ public void exec() {
             );
         }
     }
+
+    /**
+     * Accumulates all metas that should be attached to unphied XMIR.
+     * +package meta is prohibited since it's converted to special object
+     * with "λ -> Package" binding.
+     * @since 0.36.0
+     */
+    private static class Metas extends IterableEnvelope<Directive> {
+        /**
+         * Package meta.
+         */
+        private static final String PACKAGE = "package";
+
+        /**
+         * Ctor.
+         * @param metas Metas to append
+         */
+        Metas(final Iterable<String> metas) {
+            super(
+                new Joined<>(
+                    new Mapped<>(
+                        meta -> {
+                            final String[] pair = meta.split(" ", 2);
+                            final String head = pair[0].substring(1);
+                            if (head.equals(UnphiMojo.Metas.PACKAGE)) {
+                                throw new IllegalStateException(
+                                    "+package meta is prohibited for attaching to unphied XMIR"
+                                );
+                            }
+                            final Directives dirs = new Directives()
+                                .xpath("/program/metas")
+                                .add("meta")
+                                .add("head").set(head).up()
+                                .add("tail");
+                            if (pair.length > 1) {
+                                dirs.set(pair[1].trim()).up();
+                                for (final String part : pair[1].trim().split(" ")) {
+                                    dirs.add("part").set(part).up();
+                                }
+                            } else {
+                                dirs.up();
+                            }
+                            return dirs.up();
+                        },
+                        metas
+                    )
+                )
+            );
+        }
+    }
 }