Merge branch '__rultor'

objectionary · Mar 15, 2024 · 3a4f98c · 3a4f98c
2 parents cb5d61b + a4315ac
commit 3a4f98c
Show file tree

Hide file tree

Showing 9 changed files with 5,922 additions and 4 deletions.
diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/bool-tests.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/bool-tests.yaml
diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/print/xmir/bool-tests.xmir b/eo-maven-plugin/src/test/resources/org/eolang/maven/print/xmir/bool-tests.xmir
diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/unphi/bool-tests.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/unphi/bool-tests.yaml
diff --git a/eo-parser/src/main/antlr4/org/eolang/parser/Eo.g4 b/eo-parser/src/main/antlr4/org/eolang/parser/Eo.g4
@@ -288,16 +288,20 @@ vapplicationArgHapplicationUnbound
     ;
 
 // Vertical anonym object as argument of vertical application
-// todo - replace with formation?
 vapplicationArgVanonymUnbound
-    : commentMandatory formation
-    | formationNameless
+    : formationNamedOrNameless
     ;
 
 formationNameless
     : attributes innersOrEol
     ;
 
+// Formation with or without name
+formationNamedOrNameless
+    : commentMandatory formation
+    | formationNameless
+    ;
+
 // Bound vertical anonym abstract object as argument of vertical application argument
 // Ends on the next line
 vapplicationArgVanonymBound
@@ -422,11 +426,13 @@ vmethodOptional
 // 1. vertical method
 // 2. vertical application
 // 3. just an object reference
+// 4. vertical formation
 // Ends on the next line
 vmethodHead
     : vmethodHead methodTailOptional vmethodHeadApplicationTail
     | vmethodHeadVapplication
     | justNamed EOL
+    | formationNamedOrNameless
     ;
 
 methodTailOptional

diff --git a/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java b/eo-parser/src/main/java/org/eolang/parser/XeEoListener.java
@@ -737,6 +737,16 @@ public void exitFormationNameless(final EoParser.FormationNamelessContext ctx) {
         // Nothing here
     }
 
+    @Override
+    public void enterFormationNamedOrNameless(final EoParser.FormationNamedOrNamelessContext ctx) {
+        // Nothing here
+    }
+
+    @Override
+    public void exitFormationNamedOrNameless(final EoParser.FormationNamedOrNamelessContext ctx) {
+        // Nothing here
+    }
+
     @Override
     public void enterVapplicationArgVanonymBound(
         final EoParser.VapplicationArgVanonymBoundContext ctx