fix(#2787): grammar + test

objectionary · Jan 17, 2024 · 7b591f4 · 7b591f4
1 parent a178c59
commit 7b591f4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/UnphiMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/UnphiMojoTest.java
@@ -44,6 +44,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.yaml.snakeyaml.Yaml;
 
 /**
@@ -144,8 +145,9 @@ void convertsToXmirAndBack(final String pack, @TempDir final Path temp) throws E
         );
     }
 
-    @Test
-    void convertsValidXmirAndParsableEO(@TempDir final Path temp) throws IOException {
+    @ParameterizedTest
+    @CsvSource({"true", "false"})
+    void convertsValidXmirAndParsableEO(final boolean reversed, @TempDir final Path temp) throws Exception {
         final Map<String, Path> map = new FakeMaven(temp)
             .withProgram(
                 "[args] > app",
@@ -154,6 +156,7 @@ void convertsValidXmirAndParsableEO(@TempDir final Path temp) throws IOException
             )
             .with("printSourcesDir", temp.resolve("target/1-parse").toFile())
             .with("printOutputDir", temp.resolve("target/generated-sources").toFile())
+            .with("printReversed", reversed)
             .execute(ParseMojo.class)
             .execute(OptimizeMojo.class)
             .execute(PhiMojo.class)

diff --git a/eo-parser/src/main/antlr4/org/eolang/parser/Eo.g4 b/eo-parser/src/main/antlr4/org/eolang/parser/Eo.g4
@@ -181,10 +181,8 @@ vapplication
 // Vertical application head
 vapplicationHead
     : applicable
-    | hmethodExtended
-    | hmethodExtendedVersioned
-    | vmethod
-    | vmethodVersioned
+    | hmethodOptional
+    | vmethodOptional
     | versioned
     ;
 
@@ -193,6 +191,11 @@ vapplicationHeadNamed
     : vapplicationHead oname?
     ;
 
+// Vertical application head with binding
+vapplicationHeadAs
+    : vapplicationHead as
+    ;
+
 // Vertical application arguments
 vapplicationArgs
     : EOL
@@ -245,11 +248,6 @@ vapplicationArgHapplicationUnbinded
     : happlicationExtended oname?
     ;
 
-// Vertical application head with binding
-vapplicationHeadAs
-    : (applicable | hmethodOptional | versioned) as
-    ;
-
 // Vertical anonym object as argument of vertical application
 vapplicationArgVanonymUnbinded
     : attributes oname? formatees?

diff --git a/...er/src/test/resources/org/eolang/parser/packs/syntax/vertical-methods-in-application.yaml b/...er/src/test/resources/org/eolang/parser/packs/syntax/vertical-methods-in-application.yaml
@@ -10,4 +10,18 @@ eo: |
     .b:0
     c
     .d
-    .e:1
+    .e:1
+  Q
+  .org
+  .eolang
+  .io
+  .stdout > third
+    Q
+    .org
+    .eolang
+    .string:0
+      Q.
+      .org
+      .eolang
+      .bytes
+        00-AX-23