Merge branch 'fix-multiplexer-iterator'

* fix-multiplexer-iterator: ASE: queuemux.hh: properly check for more() in iterator equality operator ASE: midievent.cc: show hex dump for unknown events Signed-off-by: Tim Janik <[email protected]>
tim-janik · Nov 17, 2023 · 4756546 · 4756546
2 parents 8f23a2d + b63bb57
commit 4756546
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ase/midievent.cc b/ase/midievent.cc
@@ -73,7 +73,9 @@ MidiEvent::to_string () const
     case SYSEX:                 if (!et) et = "SYSEX";
       return string_format ("%+4d %s (unhandled)", frame, et);
     }
-  return string_format ("%+4d MidiEvent-%u (unhandled)", frame, type);
+  static_assert (sizeof (MidiEvent) >= 2 * sizeof (uint64_t));
+  const uint64_t *uu = reinterpret_cast<const uint64_t*> (this);
+  return string_format ("%+4d MidiEvent-%u (%08x %08x)", frame, type, uu[0], uu[1]);
 }
 
 MidiEvent

diff --git a/ase/queuemux.hh b/ase/queuemux.hh
@@ -84,8 +84,8 @@ struct QueueMultiplexer {
     using reference = const value_type&;
     using iterator_category = std::input_iterator_tag;
     /*ctor*/    Iter       (QueueMultiplexer *u = nullptr) : mux_ (u && u->more() ? u : nullptr) {}
-    bool        oob        () const { return !mux_; }
-    friend bool operator== (const Iter &a, const Iter &b) { return a.mux_ == b.mux_; }
+    bool        more       () const { return mux_ && mux_->more(); }
+    friend bool operator== (const Iter &a, const Iter &b) { return a.more() == b.more(); }
     value_type& operator*  () const { return mux_ ? mux_->peek() : empty(); }
     Iter        operator++ (int) { Iter copy (*this); this->operator++(); return copy; }
     Iter&       operator++ ()