Address review comments

p4lang · Mar 12, 2024 · f3c91ac · f3c91ac
1 parent a49985c
commit f3c91ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/lib/enumerator.h b/lib/enumerator.h
@@ -256,11 +256,12 @@ class IteratorEnumerator : public Enumerator<typename Iter::value_type> {
 
 /////////////////////////////////////////////////////////////////////
 
-/// Always returns false
+/// Always empty iterator (equivalent to end())
 template <typename T>
 class EmptyEnumerator : public Enumerator<T> {
  public:
     [[nodiscard]] std::string toString() const { return "EmptyEnumerator"; }
+    /// Always returns false
     bool moveNext() { return false; }
     T getCurrent() const {
         throw std::logic_error("You cannot call 'getCurrent' on an EmptyEnumerator");

diff --git a/lib/map.h b/lib/map.h
@@ -111,8 +111,8 @@ class IterKeys {
         }
         bool operator==(const iterator &i) const { return it == i.it; }
         bool operator!=(const iterator &i) const { return it != i.it; }
-        auto operator*() const { return it->first; }
-        auto operator->() const { return &it->first; }
+        reference operator*() const { return it->first; }
+        pointer operator->() const { return &it->first; }
     } b, e;
 
  public:

diff --git a/tools/ir-generator/irclass.cpp b/tools/ir-generator/irclass.cpp
@@ -528,11 +528,12 @@ bool IrClass::shouldSkip(cstring feature) const {
     // (except for validate)
     if (feature == "validate") return false;
 
-    bool provided =
-        Util::enumerate(elements)
-            ->where([](IrElement *e) { return e->is<IrMethod>(); })
-            ->where([feature](IrElement *e) { return e->to<IrMethod>()->name == feature; })
-            ->any();
+    bool provided = Util::enumerate(elements)
+                        ->where([feature](IrElement *e) {
+                            const auto *m = e->to<IrMethod>();
+                            return m && m->name == feature;
+                        })
+                        ->any();
     return provided;
 }