#155: hsuffix removed

eo-compiler/src/main/antlr4/org/eolang/compiler/Program.g4

@@ -110,7 +110,7 @@ application
   htail?
   |
   application
-  hsuffix
+  suffix
   htail?
   ;
 
@@ -135,15 +135,10 @@ htail
     |
     SPACE
     application
-    hsuffix
+    suffix
   )+
   ;
 
-hsuffix
-  :
-  suffix
-  ;
-
 hhead
   :
   AT

eo-compiler/src/main/java/org/eolang/compiler/XeListener.java

@@ -120,11 +120,11 @@ public void enterAbstraction(final ProgramParser.AbstractionContext ctx) {
                 .attr("name", attr.getText())
                 .up();
         }
+        this.dirs.up();
     }
 
     @Override
     public void exitAbstraction(final ProgramParser.AbstractionContext ctx) {
-        this.dirs.up();
     }
 
     @Override
@@ -139,14 +139,16 @@ public void exitTail(final ProgramParser.TailContext ctx) {
 
     @Override
     public void enterSuffix(final ProgramParser.SuffixContext ctx) {
-        this.dirs.attr("name", ctx.NAME().getText());
+        this.dirs.xpath("o[last()]").strict(1)
+            .attr("name", ctx.NAME().getText());
         if (ctx.CONST() != null) {
             this.dirs.attr("const", "");
         }
     }
 
     @Override
     public void exitSuffix(final ProgramParser.SuffixContext ctx) {
+        this.dirs.up();
     }
 
     @Override
@@ -206,16 +208,6 @@ public void exitHtail(final ProgramParser.HtailContext ctx) {
         this.dirs.up();
     }
 
-    @Override
-    public void enterHsuffix(final ProgramParser.HsuffixContext ctx) {
-        this.dirs.xpath("o[last()]").strict(1);
-    }
-
-    @Override
-    public void exitHsuffix(final ProgramParser.HsuffixContext ctx) {
-        this.dirs.up();
-    }
-
     @Override
     public void enterData(final ProgramParser.DataContext ctx) {
         final String type;