A16-0-1: improve range logic

Author: knewbury01

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

@@ -53,10 +53,18 @@ pragma[noinline]
 predicate isPreprocConditionalRange(
   PreprocessorBranch pb, string filepath, int startLine, int endLine
 ) {
-  exists(PreprocessorEndif end | pb.getEndIf() = end |
-    isPreprocFileAndLine(pb, filepath, startLine) and
-    isPreprocFileAndLine(end, filepath, 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)
+    )
 }
 
 /**

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

@@ -2,6 +2,5 @@
 | 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:33:1:33:26 | #ifdef OBJECTLIKE_MACRO_NO | 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. |

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

@@ -30,10 +30,10 @@ int g;
 #include <string>         // COMPLIANT
 #endif                    // COMPLIANT
 
-#ifdef OBJECTLIKE_MACRO_NO // NON_COMPLIANT
-int x = 0;                 // not present
+#ifdef OBJECTLIKE_MACRO_NO // COMPLIANT
+int x0 = 0;                // not present
 #elif OBJECTLIKE_MACRO > 0 // NON_COMPLIANT
-int x = 1;  // present
+int x0 = 1; // present
 #endif                     // COMPLIANT
 
 #ifdef OBJECTLIKE_MACRO // NON_COMPLIANT