Merge pull request #2116 from guwirth/close-793

handle type traits ...::type
SonarOpenCommunity · Apr 22, 2021 · fa66ecc · fa66ecc
2 parents 316d3cb + f2cdeca
commit fa66ecc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java b/cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java
@@ -854,7 +854,12 @@ private static void expressions(LexerfulGrammarBuilder b) {
     ).skipIfOneChild();
 
     b.rule(relationalExpression).is(
-      compareExpression, b.zeroOrMore(b.firstOf("<", ">", "<=", ">="), compareExpression) // C++
+      compareExpression,
+      b.zeroOrMore(
+        b.firstOf(
+          "<", b.sequence(">", b.nextNot("::", "type")), "<=", ">="),
+        compareExpression
+      ) // C++
     ).skipIfOneChild();
 
     b.rule(equalityExpression).is(
@@ -2204,8 +2209,10 @@ private static void templates(LexerfulGrammarBuilder b) {
       )
     );
 
-    b.rule(typeTraits).is( // syntax sugar to handle type trais (not part of standard)
-      nestedNameSpecifier, "type", b.optional("*"), b.optional("=", initializerClause)
+    b.rule(typeTraits).is( // syntax sugar to handle type traits ...::type  (not part of C++ grammar)
+      b.zeroOrMore(b.sequence(IDENTIFIER, "::")),
+      simpleTemplateId, "::", "type", b.optional("*"),
+      b.optional("=", initializerClause)
     );
 
     b.rule(innerTypeParameter).is(

diff --git a/cxx-squid/src/test/resources/parser/own/C++11/type-traits.cc b/cxx-squid/src/test/resources/parser/own/C++11/type-traits.cc
@@ -13,3 +13,15 @@ void destroy(T* t)
     std::cout << "destroying non-trivially destructible T\n";
     t->~T();
 }
+
+// issue #793
+template<class T,
+         typename std::enable_if<
+             !std::is_trivially_destructible<T>{} &&
+             (std::is_class<T>{} || std::is_union<T>{})
+            >::type* = nullptr>
+void destroy(T* t)
+{
+    std::cout << "destroying non-trivially destructible T\n";
+    t->~T();
+}