Merge remote-tracking branch 'origin/feature/migrateGoLanguageModule'…

… into feature/migrateGoLanguageModule
jplag · Apr 23, 2024 · f0d963c · f0d963c
2 parents f89a931 + 9c43b92
commit f0d963c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java b/language-antlr-utils/src/main/java/de/jplag/antlr/ContextVisitor.java
@@ -83,9 +83,9 @@ public AbstractVisitor<T> mapRange(TokenType tokenType) {
      * @param mapper The mapper function
      */
     public TerminalVisitor delegateTerminal(Function<T, TerminalNode> mapper) {
-        TerminalVisitor delegate = new TerminalVisitor((ignore) -> true);
-        this.delegate = new DelegateVisitor<>(delegate, parentData -> mapper.apply(parentData).getSymbol());
-        return delegate;
+        TerminalVisitor delegateVisitor = new TerminalVisitor(ignore -> true);
+        this.delegate = new DelegateVisitor<>(delegateVisitor, parentData -> mapper.apply(parentData).getSymbol());
+        return delegateVisitor;
     }
 
     /**
@@ -95,10 +95,10 @@ public TerminalVisitor delegateTerminal(Function<T, TerminalNode> mapper) {
      * @param mapper The mapper function
      */
     public TerminalVisitor delegateTerminalExit(Function<T, TerminalNode> mapper) {
-        TerminalVisitor delegate = new TerminalVisitor((ignore) -> true);
-        this.delegate = new DelegateVisitor<>(delegate, parentData -> mapper.apply(parentData).getSymbol());
+        TerminalVisitor delegateVisitor = new TerminalVisitor(ignore -> true);
+        this.delegate = new DelegateVisitor<>(delegateVisitor, parentData -> mapper.apply(parentData).getSymbol());
         this.delegate.mapOnExit();
-        return delegate;
+        return delegateVisitor;
     }
 
     /**
@@ -107,7 +107,7 @@ public TerminalVisitor delegateTerminalExit(Function<T, TerminalNode> mapper) {
      * @param mapper The mapper function
      */
     public <V extends ParserRuleContext> ContextVisitor<V> delegateContext(Function<T, V> mapper) {
-        ContextVisitor<V> visitor = new ContextVisitor<>((ignore) -> true);
+        ContextVisitor<V> visitor = new ContextVisitor<>(ignore -> true);
         this.delegate = new ContextDelegateVisitor<>(visitor, mapper);
         return visitor;
     }

diff --git a/languages/golang/src/main/java/de/jplag/golang/GoListener.java b/languages/golang/src/main/java/de/jplag/golang/GoListener.java
@@ -184,10 +184,9 @@ private void functionDeclarations() {
 
     private void controlFlowRules() {
         visit(IfStmtContext.class).delegateTerminal(IfStmtContext::IF).map(IF_STATEMENT);
-        visit(BlockContext.class, context -> context.parent instanceof IfStmtContext && context.equals(((IfStmtContext) context.parent).block(0)))
-                .map(IF_BLOCK_BEGIN, IF_BLOCK_END);
-        // TODO no else token?
-        visit(BlockContext.class, context -> context.parent instanceof IfStmtContext && context.equals(((IfStmtContext) context.parent).block(1)))
+        visit(BlockContext.class, context -> context.parent instanceof IfStmtContext ifStmt && context.equals((ifStmt).block(0))).map(IF_BLOCK_BEGIN,
+                IF_BLOCK_END);
+        visit(BlockContext.class, context -> context.parent instanceof IfStmtContext ifStmt && context.equals((ifStmt).block(1)))
                 .map(ELSE_BLOCK_BEGIN, ELSE_BLOCK_END);
 
         visit(ForStmtContext.class).map(FOR_STATEMENT);