Declarations1: improve alert message rules 5-1 and 5-4

Author: knewbury01

c/misra/src/rules/RULE-5-1/ExternalIdentifiersNotDistinct.ql

@@ -24,7 +24,10 @@ class ExternalIdentifiersLong extends ExternalIdentifiers {
   ExternalIdentifiersLong() { this.getName().length() >= 32 }
 }
 
-predicate notSame(ExternalIdentifiers d, ExternalIdentifiers d2) { not d = d2 }
+predicate notSame(ExternalIdentifiers d, ExternalIdentifiers d2) {
+  not d = d2 and
+  d.getLocation().getStartLine() >= d2.getLocation().getStartLine()
+}
 
 from ExternalIdentifiers d, ExternalIdentifiers d2
 where

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

@@ -15,13 +15,15 @@
 import cpp
 import codingstandards.c.misra
 
-from Macro m
+from Macro m, Macro m2
 where
   not isExcluded(m, Declarations1Package::macroIdentifiersNotDistinctQuery()) and
-  exists(Macro m2 |
-    not m = m2 and
+  not m = m2 and
+  (
     if m.getName().length() >= 64
     then m.getName().substring(0, 62) = m2.getName().substring(0, 62)
     else m.getName() = m2.getName()
-  )
-select m, "Nondistinct macro identifer used " + m.getName() + " ."
+  ) and
+  //reduce double report since both macros are in alert, arbitrary ordering
+  m.getLocation().getStartLine() >= m2.getLocation().getStartLine()
+select m, "Nondistinct macro identifer used " + m.getName() + " compared to $@.", m2, m2.getName()

c/misra/test/rules/RULE-5-4/MacroIdentifiersNotDistinct.expected

@@ -1,4 +1,2 @@
-| test.c:1:1:1:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA | Nondistinct macro identifer used iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA . |
-| test.c:2:1:2:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB | Nondistinct macro identifer used iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB . |
-| test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | Nondistinct macro identifer used FUNCTION_MACRO . |
-| test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Nondistinct macro identifer used FUNCTION_MACRO . |
+| test.c:2:1:2:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB | Nondistinct macro identifer used iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB compared to $@. | test.c:1:1:1:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA | iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA |
+| test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Nondistinct macro identifer used FUNCTION_MACRO compared to $@. | test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | FUNCTION_MACRO |