C++: Give Iterator a proper interface.

geoffw0 · geoffw0 · commit c9f846e0d2cf · 2020-11-05T16:43:50.000Z
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Iterator.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Iterator.qll
@@ -48,10 +48,10 @@ private class StdIterator extends Class {
 }
 
 /**
- * A type which can be used as an iterator
+ * Implements `Iterator`.
  */
-class Iterator extends Type {
-  Iterator() {
+private class IteratorImpl extends Iterator {
+  IteratorImpl() {
     this instanceof IteratorByTypedefs or
     exists(IteratorTraits it | it.getIteratorType() = this) or
     this instanceof StdIterator
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/StdContainer.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/StdContainer.qll
@@ -3,7 +3,7 @@
  */
 
 import semmle.code.cpp.models.interfaces.Taint
-import semmle.code.cpp.models.implementations.Iterator
+import semmle.code.cpp.models.interfaces.Iterator
 
 /**
  * Additional model for standard container constructors that reference the
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/StdMap.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/StdMap.qll
@@ -3,7 +3,7 @@
  */
 
 import semmle.code.cpp.models.interfaces.Taint
-import semmle.code.cpp.models.implementations.Iterator
+import semmle.code.cpp.models.interfaces.Iterator
 
 /**
  * Additional model for map constructors using iterator inputs.
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/StdSet.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/StdSet.qll
@@ -3,7 +3,7 @@
  */
 
 import semmle.code.cpp.models.interfaces.Taint
-import semmle.code.cpp.models.implementations.Iterator
+import semmle.code.cpp.models.interfaces.Iterator
 
 /**
  * Additional model for set constructors using iterator inputs.
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/StdString.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/StdString.qll
@@ -5,7 +5,8 @@
  */
 
 import semmle.code.cpp.models.interfaces.Taint
-import semmle.code.cpp.models.implementations.Iterator
+import semmle.code.cpp.models.interfaces.Iterator
+import semmle.code.cpp.models.interfaces.DataFlow
 
 /**
  * The `std::basic_string` template class.
diff --git a/cpp/ql/src/semmle/code/cpp/models/interfaces/Iterator.qll b/cpp/ql/src/semmle/code/cpp/models/interfaces/Iterator.qll
@@ -26,3 +26,9 @@ abstract class GetIteratorFunction extends Function {
    */
   abstract predicate getsIterator(FunctionInput input, FunctionOutput output);
 }
+
+/**
+ * A type which can be used as an iterator.
+ */
+abstract class Iterator extends Type {
+}
