Simplify TopologicalOrders (#6811)

Make `TopologicalOrders` its own iterator rather than having a separate
iterator class that wraps a pointer to `TopologicalOrders`. This
simplifies usage in cases where an iterator needs to be persistently
stored. Notably, all of the tests continue working as they are.

2 files changed, 22 insertions, 28 deletions

diff --git a/src/support/topological_orders.cpp b/src/support/topological_orders.cpp
index 939c76c6e..145ba3004 100644
--- a/src/support/topological_orders.cpp
+++ b/src/support/topological_orders.cpp
@@ -95,7 +95,7 @@ TopologicalOrders::TopologicalOrders(
   }
 }
 
-void TopologicalOrders::advance() {
+TopologicalOrders& TopologicalOrders::operator++() {
   // Find the last selector that can be advanced, popping any that cannot.
   std::optional<Selector> next;
   while (!selectors.empty() && !(next = selectors.back().advance(*this))) {
@@ -104,7 +104,7 @@ void TopologicalOrders::advance() {
   if (!next) {
     // No selector could be advanced, so we've seen every possible ordering.
     assert(selectors.empty());
-    return;
+    return *this;
   }
   // We've advanced the last selector on the stack, so initialize the
   // subsequent selectors.
@@ -113,6 +113,8 @@ void TopologicalOrders::advance() {
   while (selectors.size() < graph.size()) {
     selectors.push_back(selectors.back().select(*this));
   }
+
+  return *this;
 }
 
 } // namespace wasm
diff --git a/src/support/topological_orders.h b/src/support/topological_orders.h
index acab78ee5..48941c021 100644
--- a/src/support/topological_orders.h
+++ b/src/support/topological_orders.h
@@ -28,35 +28,29 @@ namespace wasm {
 // https://en.wikipedia.org/wiki/Topological_sorting) that iteratively makes all
 // possible choices for each position of the output order.
 struct TopologicalOrders {
+  using value_type = const std::vector<size_t>;
+  using difference_type = std::ptrdiff_t;
+  using reference = const std::vector<size_t>&;
+  using pointer = const std::vector<size_t>*;
+  using iterator_category = std::input_iterator_tag;
+
   // Takes an adjacency list, where the list for each vertex is a sorted list of
   // the indices of its children, which will appear after it in the order.
   TopologicalOrders(const std::vector<std::vector<size_t>>& graph);
 
-  struct Iterator {
-    using value_type = const std::vector<size_t>;
-    using difference_type = std::ptrdiff_t;
-    using reference = const std::vector<size_t>&;
-    using pointer = const std::vector<size_t>*;
-    using iterator_category = std::input_iterator_tag;
-
-    TopologicalOrders* parent;
+  TopologicalOrders begin() { return TopologicalOrders(graph); }
+  TopologicalOrders end() { return TopologicalOrders({}); }
 
-    bool isEnd() const { return !parent || parent->selectors.empty(); }
-    bool operator==(const Iterator& other) const {
-      return isEnd() == other.isEnd();
-    }
-    bool operator!=(const Iterator& other) const { return !(*this == other); }
-    const std::vector<size_t>& operator*() { return parent->buf; }
-    const std::vector<size_t>* operator->() { return &parent->buf; }
-    Iterator& operator++() {
-      parent->advance();
-      return *this;
-    }
-    Iterator operator++(int) { return ++(*this); }
-  };
-
-  Iterator begin() { return {this}; }
-  Iterator end() { return {nullptr}; }
+  bool operator==(const TopologicalOrders& other) const {
+    return selectors.empty() == other.selectors.empty();
+  }
+  bool operator!=(const TopologicalOrders& other) const {
+    return !(*this == other);
+  }
+  const std::vector<size_t>& operator*() { return buf; }
+  const std::vector<size_t>* operator->() { return &buf; }
+  TopologicalOrders& operator++();
+  TopologicalOrders operator++(int) { return ++(*this); }
 
 private:
   // The input graph given as an adjacency list with edges from vertices to
@@ -95,8 +89,6 @@ private:
   // A stack of selectors, one for each vertex in a complete topological order.
   // Empty if we've already seen every possible ordering.
   std::vector<Selector> selectors;
-
-  void advance();
 };
 
 } // namespace wasm