Update to use features from codeql-qtil

Author: MichaelRFairhurst

cpp/common/src/codingstandards/cpp/util/CondensedList.qll

@@ -1,6 +1,8 @@
 ---
 lockVersion: 1.0.0
 dependencies:
+  advanced-security/qtil:
+    version: 0.0.1
   codeql/cpp-all:
     version: 2.1.1
   codeql/dataflow:

cpp/common/src/codingstandards/cpp/util/Pair.qll

@@ -6,3 +6,4 @@ license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
   codeql/cpp-all: 2.1.1
+  advanced-security/qtil: 0.0.1

cpp/misra/src/codeql-pack.lock.yml

@@ -16,18 +16,15 @@
 
 import cpp
 import codingstandards.cpp.misra
-import codingstandards.cpp.util.CondensedList
-import codingstandards.cpp.util.Pair
+import qtil.Qtil
 
 class DefOrUndef extends PreprocessorDirective {
-  string name;
+  DefOrUndef() { this instanceof PreprocessorUndef or this instanceof Macro }
 
-  DefOrUndef() {
-    name = this.(PreprocessorUndef).getName() or
-    name = this.(Macro).getName()
+  string getName() {
+    result = this.(PreprocessorUndef).getName() or
+    result = this.(Macro).getName()
   }
-
-  string getName() { result = name }
 }
 
 predicate relevantNameAndFile(string name, File file) {
@@ -37,30 +34,24 @@ predicate relevantNameAndFile(string name, File file) {
   )
 }
 
-class StringFilePair = Pair<string, File>::Where<relevantNameAndFile/2>::Pair;
-
-module DefUndefListConfig implements CondensedListSig {
-  class Division = StringFilePair;
+class StringFilePair = Qtil::Pair<string, File, relevantNameAndFile/2>::Pair;
 
-  class Item = DefOrUndef;
+/**
+ * Defs and undefs ordered by location, grouped by name and file.
+ */
+class OrderedDefOrUndef extends Qtil::Ordered<DefOrUndef>::GroupBy<StringFilePair>::Type {
+  override int getOrder() { result = getLocation().getStartLine() }
 
-  int getSparseIndex(StringFilePair division, DefOrUndef directive) {
-    directive.getName() = division.getFirst() and
-    directive.getFile() = division.getSecond() and
-    result = directive.getLocation().getStartLine()
+  override StringFilePair getGroup() {
+    result.getFirst() = getName() and result.getSecond() = getFile()
   }
 }
 
-class ListEntry = Condense<DefUndefListConfig>::ListEntry;
-
-from PreprocessorUndef undef, ListEntry defUndefListEntry
+from OrderedDefOrUndef defOrUndef
 where
-  not isExcluded(undef, PreprocessorPackage::undefOfMacroNotDefinedInFileQuery()) and
-  // There exists a def or undef for a given name and file, and it is an #undef
-  undef = defUndefListEntry.getItem() and
-  // Exclude cases where the previous def or undef with the same name in the same file is a #define
-  not exists(ListEntry prev |
-    prev = defUndefListEntry.getPrev() and
-    prev.getItem() instanceof Macro
-  )
-select undef, "Undef of name '" + undef.getName() + "' not defined in the same file."
+  not isExcluded(defOrUndef, PreprocessorPackage::undefOfMacroNotDefinedInFileQuery()) and
+  // There exists an #undef for a given name and file
+  defOrUndef instanceof PreprocessorUndef and
+  // A previous def or undef of this name must exist in this file, and it must be a #define
+  not defOrUndef.getPrevious() instanceof Macro
+select defOrUndef, "Undef of name '" + defOrUndef.getName() + "' not defined in the same file."

cpp/misra/src/qlpack.yml

@@ -1,6 +1,8 @@
 ---
 lockVersion: 1.0.0
 dependencies:
+  advanced-security/qtil:
+    version: 0.0.1
   codeql/cpp-all:
     version: 2.1.1
   codeql/dataflow: