Merge pull request #1659 from ivangalkin/SquidAstVisitorContext

SquidAstVisitorContext: remove redundant references

Author: guwirth

cxx-squid/src/main/java/org/sonar/cxx/CxxAstScanner.java

@@ -219,10 +219,10 @@ public String getContents(String comment) {
     builder.withSquidAstVisitor(new CxxFunctionSizeVisitor<>(language));
 
     // to emit a 'new file' event to the internals of the plugin
-    builder.withSquidAstVisitor(new CxxFileVisitor<>(context));
+    builder.withSquidAstVisitor(new CxxFileVisitor<>());
 
     // log syntax errors
-    builder.withSquidAstVisitor(new CxxParseErrorLoggerVisitor<>(context));
+    builder.withSquidAstVisitor(new CxxParseErrorLoggerVisitor<>());
 
     /* External visitors (typically Check ones) */
     for (SquidAstVisitor<Grammar> visitor : visitors) {

cxx-squid/src/main/java/org/sonar/cxx/visitors/CxxFileVisitor.java

@@ -20,27 +20,15 @@
 package org.sonar.cxx.visitors;
 
 import com.sonar.sslr.api.AstNode;
-import com.sonar.sslr.api.AstVisitor;
 import com.sonar.sslr.api.Grammar;
 import org.sonar.cxx.parser.CxxParser;
 import org.sonar.squidbridge.SquidAstVisitor;
-import org.sonar.squidbridge.SquidAstVisitorContext;
 
-public class CxxFileVisitor<GRAMMAR extends Grammar> extends SquidAstVisitor<GRAMMAR>
-  implements AstVisitor {
+public class CxxFileVisitor<GRAMMAR extends Grammar> extends SquidAstVisitor<GRAMMAR> {
 
-  private final SquidAstVisitorContext<?> context;
-
-  public CxxFileVisitor(SquidAstVisitorContext<?> context) {
-    this.context = context;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public void visitFile(AstNode node) {
-    CxxParser.finishedParsing(context.getFile());
+    CxxParser.finishedParsing(getContext().getFile());
   }
 
 }

cxx-squid/src/main/java/org/sonar/cxx/visitors/CxxParseErrorLoggerVisitor.java

@@ -20,7 +20,6 @@
 package org.sonar.cxx.visitors;
 
 import com.sonar.sslr.api.AstNode;
-import com.sonar.sslr.api.AstVisitor;
 import com.sonar.sslr.api.GenericTokenType;
 import com.sonar.sslr.api.Grammar;
 import com.sonar.sslr.api.TokenType;
@@ -30,23 +29,15 @@
 import org.sonar.cxx.api.CxxPunctuator;
 import org.sonar.cxx.parser.CxxGrammarImpl;
 import org.sonar.squidbridge.SquidAstVisitor;
-import org.sonar.squidbridge.SquidAstVisitorContext;
 
-public class CxxParseErrorLoggerVisitor<GRAMMAR extends Grammar>
-  extends SquidAstVisitor<GRAMMAR> implements AstVisitor {
+public class CxxParseErrorLoggerVisitor<GRAMMAR extends Grammar> extends SquidAstVisitor<GRAMMAR> {
 
   private static final String SYNTAX_ERROR_MSG
     = "Source code parser: {} syntax error(s) detected. Syntax errors could cause invalid software metric values."
     + " Root cause are typically missing includes, missing macros or compiler specific extensions.";
   private static final Logger LOG = Loggers.get(CxxParseErrorLoggerVisitor.class);
   private static int errors = 0;
 
-  private final SquidAstVisitorContext<?> context;
-
-  public CxxParseErrorLoggerVisitor(SquidAstVisitorContext<?> context) {
-    this.context = context;
-  }
-
   public static void finalReport() {
     if (errors != 0) {
       LOG.warn(SYNTAX_ERROR_MSG, errors);
@@ -85,7 +76,7 @@ public void visitNode(AstNode node) {
         // part with CURLBR_LEFT is typically an ignored declaration
         if (identifierLine != -1) {
           LOG.debug("[{}:{}]: skip declaration: {}",
-            context.getFile(), identifierLine, sb.toString());
+            getContext().getFile(), identifierLine, sb.toString());
           sb.setLength(0);
           identifierLine = -1;
         }
@@ -100,7 +91,7 @@ public void visitNode(AstNode node) {
     if (identifierLine != -1 && sb.length() > 0) {
       // part without CURLBR_LEFT is typically a syntax error
       LOG.debug("[{}:{}]:    syntax error: {}",
-        context.getFile(), identifierLine, sb.toString());
+        getContext().getFile(), identifierLine, sb.toString());
     }
   }