Rule 5.4: Address review comments

Author: lcartey

c/misra/src/rules/RULE-5-4/MacroIdentifiersNotDistinct.ql

@@ -99,8 +99,8 @@ where
   // when m2 is defined
   isIncludedUnconditionallyFromCommonFile(m, m2) and
   // Macros can't be mutually exclusive
-  not mutuallyExclusiveMacros(m, m2) and
-  not mutuallyExclusiveMacros(m2, m) and
+  not mutuallyExclusiveBranchDirectiveMacros(m, m2) and
+  not mutuallyExclusiveBranchDirectiveMacros(m2, m) and
   // If at least one invocation exists for at least one of the macros, then they must share a link
   // target - i.e. must both be expanded in the same context
   (

cpp/common/src/codingstandards/cpp/PreprocessorDirective.qll

@@ -98,12 +98,9 @@ predicate isMacroDefinedWithinBranch(PreprocessorBranchDirective bd, Macro m) {
  * Holds if the pair of macros are "conditional" i.e. only one of the macros is followed in any
  * particular compilation of the containing file.
  */
-predicate mutuallyExclusiveMacros(Macro firstMacro, Macro secondMacro) {
-  exists(
-    PreprocessorBranchDirective b1, PreprocessorBranchDirective b2, string filepath,
-    int b1StartLocation, int b2StartLocation
-  |
-    isBranchDirectivePair(b1, b2, filepath, b1StartLocation, b2StartLocation) and
+predicate mutuallyExclusiveBranchDirectiveMacros(Macro firstMacro, Macro secondMacro) {
+  exists(PreprocessorBranchDirective b1, PreprocessorBranchDirective b2 |
+    isBranchDirectivePair(b1, b2, _, _, _) and
     isMacroDefinedWithinBranch(b1, firstMacro) and
     isMacroDefinedWithinBranch(b2, secondMacro)
   )