Merge pull request #1667 from guwirth/optimize-AST

optimize AST

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,11 +67,15 @@ 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()
-        .anyMatch(childNode -> CxxKeyword.NAMESPACE.equals(childNode.getToken().getType()));
-      if (containsNamespace) {
-        getContext().createLineViolation(this, "Using namespace are not allowed in header files.", node);
+    if (isHeader) {
+      // declaration directly in translation unit
+      if (node.getParent().is(CxxGrammarImpl.declaration)
+        && node.getParent().getParent().is(CxxGrammarImpl.translationUnit)) {
+        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);
+        }
       }
     }
   }

cxx-checks/src/test/resources/checks/UsingNamespaceInHeader.h

@@ -8,7 +8,7 @@ namespace Foo
     void fooFunc( );
 }
 
-using namespace std;
+using namespace std; // error
 
 // alias for types or template shall not be detected
 // see more details http://en.cppreference.com/w/cpp/language/type_alias
@@ -30,3 +30,13 @@ namespace Foo
         privateFunction( );
     }
 }
+
+void fooFunc()
+{
+    using namespace std;
+}
+
+namespace X
+{
+    using namespace std;
+};