optimize AST

- skip some nodes to make it more readable and improve performance
- improve grammar

Author: guwirth

cxx-checks/src/main/java/org/sonar/cxx/checks/BooleanEqualityComparisonCheck.java

@@ -42,7 +42,7 @@
 public class BooleanEqualityComparisonCheck extends SquidCheck<Grammar> {
 
   private static boolean hasBooleanLiteralOperand(AstNode node) {
-    return node.hasDirectChildren(CxxGrammarImpl.LITERAL, CxxGrammarImpl.BOOL)
+    return node.hasDirectChildren(CxxGrammarImpl.BOOL)
       && node.hasDescendant(CxxKeyword.TRUE, CxxKeyword.FALSE);
   }
 

cxx-checks/src/main/java/org/sonar/cxx/checks/UsingNamespaceInHeaderCheck.java

@@ -57,7 +57,7 @@ private static boolean isHeader(String name) {
 
   @Override
   public void init() {
-    subscribeTo(CxxGrammarImpl.blockDeclaration);
+    subscribeTo(CxxGrammarImpl.usingDirective);
   }
 
   @Override
@@ -67,8 +67,8 @@ public void visitFile(AstNode astNode) {
 
   @Override
   public void visitNode(AstNode node) {
-    if (isHeader && CxxKeyword.USING.equals(node.getToken().getType())) {
-      final boolean containsNamespace = node.getFirstChild().getChildren().stream()
+    if (isHeader) {
+      final boolean containsNamespace = node.getChildren().stream()
         .anyMatch(childNode -> CxxKeyword.NAMESPACE.equals(childNode.getToken().getType()));
       if (containsNamespace) {
         getContext().createLineViolation(this, "Using namespace are not allowed in header files.", node);