A16-0-1: improve testcase and query logic

Author: knewbury01

cpp/autosar/src/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.ql

@@ -53,17 +53,12 @@ pragma[noinline]
 predicate isPreprocConditionalRange(
   PreprocessorBranch pb, string filepath, int startLine, int endLine
 ) {
-  //the range of an if with an elif ends at the elif to avoid reporting things twice
-  if exists(PreprocessorElif elif | elif.getIf() = pb)
-  then
-    exists(PreprocessorElif end | end.getIf() = pb |
-      isPreprocFileAndLine(pb, filepath, startLine) and
-      isPreprocFileAndLine(end, filepath, endLine)
-    )
-  else
-    exists(PreprocessorEndif end | pb.getEndIf() = end |
-      isPreprocFileAndLine(pb, filepath, startLine) and
-      isPreprocFileAndLine(end, filepath, endLine)
+  isPreprocFileAndLine(pb, filepath, startLine) and
+  endLine =
+    min(int elifEndLine, PreprocessorDirective end |
+      pb.getNext() = end and isPreprocFileAndLine(end, filepath, elifEndLine)
+    |
+      elifEndLine
     )
 }
 

cpp/autosar/test/rules/A16-0-1/PreProcessorShallOnlyBeUsedForCertainDirectivesPatterns.expected

@@ -2,6 +2,7 @@
 | test.cpp:9:1:9:26 | #define OBJECTLIKE_MACRO 1 | Preprocessor directive used for conditional compilation. |
 | test.cpp:10:1:10:35 | #define FUNCTIONLIKE_MACRO(X) X + 1 | Preprocessor directive used for conditional compilation. |
 | test.cpp:11:1:11:37 | #define FUNCTIONLIKE_MACROTWO() 1 + 1 | Preprocessor directive used for conditional compilation. |
-| test.cpp:35:1:35:26 | #elif OBJECTLIKE_MACRO > 0 | Preprocessor directive used for conditional compilation. |
-| test.cpp:39:1:39:23 | #ifdef OBJECTLIKE_MACRO | Preprocessor directive used for conditional compilation. |
-| test.cpp:56:1:56:27 | #elif MACRO_ENABLED_OTHER_1 | Preprocessor directive used for conditional compilation. |
+| test.cpp:31:1:31:26 | #elif OBJECTLIKE_MACRO > 0 | Preprocessor directive used for conditional compilation. |
+| test.cpp:37:1:37:26 | #elif OBJECTLIKE_MACRO > 0 | Preprocessor directive used for conditional compilation. |
+| test.cpp:41:1:41:23 | #ifdef OBJECTLIKE_MACRO | Preprocessor directive used for conditional compilation. |
+| test.cpp:58:1:58:27 | #elif MACRO_ENABLED_OTHER_1 | Preprocessor directive used for conditional compilation. |

cpp/autosar/test/rules/A16-0-1/test.cpp

@@ -24,11 +24,13 @@ int g;
 #include <string>    // COMPLIANT
 #endif               // COMPLIANT
 
-#ifdef MACRO_ENABLED_NON  // COMPLIANT
-#include <string>         // COMPLIANT
-#elif MACRO_ENABLED_OTHER // COMPLIANT
-#include <string>         // COMPLIANT
-#endif                    // COMPLIANT
+#ifdef MACRO_ENABLED_NON   // COMPLIANT
+#include <string>          // COMPLIANT
+#elif MACRO_ENABLED_OTHER  // COMPLIANT
+#include <string>          // COMPLIANT
+#elif OBJECTLIKE_MACRO > 0 // NON_COMPLIANT
+int x00 = 1; // present
+#endif                     // COMPLIANT
 
 #ifdef OBJECTLIKE_MACRO_NO // COMPLIANT
 int x0 = 0;                // not present