Declarations1: improve alert messaages and substring predicate usage for RULE-5-1 and RULE-5-4

Author: knewbury01

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

@@ -37,6 +37,8 @@ where
   //C90 states the first 6 characters of external identifiers are significant and case is not required to be significant
   //C90 is not currently considered by this rule
   if d instanceof ExternalIdentifiersLong and d2 instanceof ExternalIdentifiersLong
-  then d.getName().substring(0, 30) = d2.getName().substring(0, 30)
+  then d.getName().prefix(31) = d2.getName().prefix(31)
   else d.getName() = d2.getName()
-select d, "External identifer is nondistinct " + d.getName() + " compared to $@.", d2, d.getName()
+select d,
+  "External identifer " + d.getName() + " is nondistinct in first 31 characters, compared to $@.",
+  d2, d2.getName()

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

@@ -25,9 +25,9 @@ where
     //ie an identifier differing on the 32nd character would be indistinct for C90 but distinct for C99
     //and is currently not reported by this rule
     if m.getName().length() >= 64
-    then m.getName().substring(0, 62) = m2.getName().substring(0, 62)
+    then m.getName().prefix(63) = m2.getName().prefix(63)
     else m.getName() = m2.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()
+select m, "Macro identifer " + m.getName() + " is nondistinct in first 63 characters, compared to $@.", m2, m2.getName()

c/misra/test/rules/RULE-5-1/ExternalIdentifiersNotDistinct.expected

@@ -1 +1 @@
-| test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | External identifer is nondistinct iltiqzxgfqsgigwfuyntzghvzltueeeB compared to $@. | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeB |
+| test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | External identifer iltiqzxgfqsgigwfuyntzghvzltueeeB is nondistinct in first 31 characters, compared to $@. | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeA |

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

@@ -1,2 +1,2 @@
-| 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 |
+| test.c:2:1:2:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB | Macro identifer iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyB is nondistinct in first 63 characters, compared to $@. | test.c:1:1:1:72 | #define iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA | iltiqzxgfqsgigwfuyntzghvzltueatcxqnqofnnvjyszmcsylyohvqaosjbqyyA |
+| test.c:8:1:8:31 | #define FUNCTION_MACRO(X) X + 1 | Macro identifer FUNCTION_MACRO is nondistinct in first 63 characters, compared to $@. | test.c:7:1:7:57 | #define FUNCTION_MACRO(FUNCTION_MACRO) FUNCTION_MACRO + 1 | FUNCTION_MACRO |