Migrate M17-0-2 to StandardLibraryNames.

Author: lcartey

cpp/autosar/src/rules/M17-0-2/NameOfStandardLibraryMacroOrObjectReused.ql

@@ -16,9 +16,13 @@
 
 import cpp
 import codingstandards.cpp.autosar
-import codingstandards.cpp.Naming
+import codingstandards.cpp.StandardLibraryNames
 
-from Locatable l, string s, string t
+module TargetedCLibrary = CStandardLibrary::C99;
+
+module TargetedCppLibrary = CppStandardLibrary::Cpp14;
+
+from Locatable l, string s, string t, string header, string standard
 where
   not isExcluded(l, NamingPackage::nameOfStandardLibraryMacroOrObjectReusedQuery()) and
   l.fromSource() and
@@ -28,8 +32,21 @@ where
     s = l.(GlobalOrNamespaceVariable).getName() and t = "Object"
   ) and
   (
-    Naming::Cpp14::hasStandardLibraryMacroName(s)
+    standard = TargetedCppLibrary::getName() and
+    (
+      TargetedCppLibrary::hasMacroName(header, s, _)
+      or
+      TargetedCppLibrary::hasObjectName(header, _, s, _, _)
+    )
     or
-    Naming::Cpp14::hasStandardLibraryObjectName(s)
+    standard = TargetedCLibrary::getName() and
+    (
+      header = max(string candidateHeader | TargetedCLibrary::hasMacroName(candidateHeader, s, _))
+      or
+      header =
+        max(string candidateHeader | TargetedCLibrary::hasObjectName(candidateHeader, _, s, _, _))
+    )
   )
-select l, t + " reuses the name " + s + " from the standard library."
+select l,
+  t + " reuses the name " + s + " from the " + standard + " standard library header <" + header +
+    ">."

cpp/autosar/test/rules/M17-0-2/NameOfStandardLibraryMacroOrObjectReused.expected

@@ -1,2 +1,2 @@
-| test.cpp:1:1:1:14 | #define NULL 0 | Macro reuses the name NULL from the standard library. |
-| test.cpp:3:5:3:10 | tzname | Object reuses the name tzname from the standard library. |
+| test.cpp:1:1:1:14 | #define NULL 0 | Macro reuses the name NULL from the C99 standard library header <wchar.h>. |
+| test.cpp:3:5:3:8 | cout | Object reuses the name cout from the C++14 standard library header <iostream>. |

cpp/autosar/test/rules/M17-0-2/test.cpp

@@ -1,3 +1,3 @@
 #define NULL 0 // NON_COMPLIANT
 
-int tzname = 0; // NON_COMPLIANT
+int cout = 0; // NON_COMPLIANT