Declarations1: improve RULE-5-1

Author: knewbury01

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

@@ -18,7 +18,7 @@ import codingstandards.cpp.Linkage
 
 class ExternalIdentifiers extends Declaration {
   ExternalIdentifiers() {
-    this.getName().length() > 31 and
+    this.getName().length() >= 31 and
     hasExternalLinkage(this) and
     getNamespace() instanceof GlobalNamespace and
     not this.isFromTemplateInstantiation(_) and
@@ -35,8 +35,6 @@ class ExternalIdentifiers extends Declaration {
     //C90 is not currently considered by this rule
     result = this.getName().prefix(31)
   }
-
-  string getNonSignificantName() { result = this.getName().suffix(31) }
 }
 
 from ExternalIdentifiers d, ExternalIdentifiers d2
@@ -45,7 +43,7 @@ where
   not d = d2 and
   d.getLocation().getStartLine() >= d2.getLocation().getStartLine() and
   d.getSignificantName() = d2.getSignificantName() and
-  not d.getNonSignificantName() = d2.getNonSignificantName()
+  not d.getName() = d2.getName()
 select d,
-  "External identifer " + d.getName() + " is nondistinct in first 31 characters, compared to $@.",
-  d2, d2.getName()
+  "External identifer " + d.getName() +
+    " is nondistinct in characters at or over 31 limit, compared to $@.", d2, d2.getName()

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

@@ -1 +1,4 @@
-| 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 |
+| test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | External identifer iltiqzxgfqsgigwfuyntzghvzltueeeB is nondistinct in characters at or over 31 limit, compared to $@. | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeA |
+| test.c:5:5:5:35 | iltiqzxgfqsgigwfuyntzghvzltueea | External identifer iltiqzxgfqsgigwfuyntzghvzltueea is nondistinct in characters at or over 31 limit, compared to $@. | test.c:4:5:4:36 | iltiqzxgfqsgigwfuyntzghvzltueeaZ | iltiqzxgfqsgigwfuyntzghvzltueeaZ |
+| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to $@. | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeA |
+| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to $@. | test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | iltiqzxgfqsgigwfuyntzghvzltueeeB |

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

@@ -1,8 +1,14 @@
-int iltiqzxgfqsgigwfuyntzghvzltueeeA; // NON_COMPLIANT
+int iltiqzxgfqsgigwfuyntzghvzltueeeA; // NON_COMPLIANT - length 32
 int iltiqzxgfqsgigwfuyntzghvzltueeeB; // NON_COMPLIANT
 
-int iltiqzxgfqsgigwfuyntzghvzltueee; // COMPLIANT
-int iltiqzxgfqsgigwfuyntzghvzltueee; // COMPLIANT
+int iltiqzxgfqsgigwfuyntzghvzltueeaZ; // NON_COMPLIANT - length 32
+int iltiqzxgfqsgigwfuyntzghvzltueea;  // NON_COMPLIANT - length 31
+
+int iltiqzxgfqsgigwfuyntzghvzltueee; // NON_COMPLIANT - length 31
+int iltiqzxgfqsgigwfuyntzghvzltueee; // NON_COMPLIANT
+
+int iltiqzxgfqsgigwfuyntzghvzltuee; // COMPLIANT - length 30
+int iltiqzxgfqsgigwfuyntzghvzltuee; // COMPLIANT
 
 int var1; // COMPLIANT
 int var2; // COMPLIANT