til::rle<T, S> - a run length encoded storage template

.github/actions/spell-check/expect/expect.txt

@@ -1437,6 +1437,7 @@ mutex
 mutexes
 muxes
 myapplet
+mybase
 mydir
 myignite
 MYMAX

src/buffer/out/AttrRow.hpp

@@ -20,36 +20,26 @@ Revision History:
 
 #pragma once
 
+#include "til/rle.h"
+
 #include "TextAttributeRun.hpp"
-#include "AttrRowIterator.hpp"
 
-class ATTR_ROW final
+class ATTR_ROW final : public til::rle<TextAttribute, UINT>
 {
 public:
-    using const_iterator = typename AttrRowIterator;
-
-    ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
-    noexcept;
+    using mybase = til::rle<TextAttribute, UINT>;
 
-    ~ATTR_ROW() = default;
+    using const_iterator = mybase::const_iterator;
+    using const_reverse_iterator = mybase::const_reverse_iterator;
 
-    ATTR_ROW(const ATTR_ROW&) = default;
-    ATTR_ROW& operator=(const ATTR_ROW&) = default;
-    ATTR_ROW(ATTR_ROW&&)
-    noexcept = default;
-    ATTR_ROW& operator=(ATTR_ROW&&) noexcept = default;
+    using mybase::mybase; // use base constructor
 
     void Reset(const TextAttribute attr);
 
     TextAttribute GetAttrByColumn(const size_t column) const;
     TextAttribute GetAttrByColumn(const size_t column,
                                   size_t* const pApplies) const;
 
-    size_t GetNumberOfRuns() const noexcept;
-
-    size_t FindAttrIndex(const size_t index,
-                         size_t* const pApplies) const;
-
     std::vector<uint16_t> GetHyperlinks();
 
     bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
@@ -62,22 +52,10 @@ class ATTR_ROW final
                                          const size_t iEnd,
                                          const size_t cBufferWidth);
 
-    static std::vector<TextAttributeRun> PackAttrs(const std::vector<TextAttribute>& attrs);
-
-    const_iterator begin() const noexcept;
-    const_iterator end() const noexcept;
-
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-
-    friend bool operator==(const ATTR_ROW& a, const ATTR_ROW& b) noexcept;
-    friend class AttrRowIterator;
-
-private:
-    boost::container::small_vector<TextAttributeRun, 1> _list;
-    size_t _cchRowWidth;
+    using mybase::begin;
+    using mybase::cbegin;
+    using mybase::cend;
+    using mybase::end;
 
-#ifdef UNIT_TESTING
-    friend class AttrRowTests;
-#endif
+    using mybase::operator==;
 };

src/buffer/out/TextAttributeRun.hpp

@@ -22,29 +22,23 @@ Revision History:
 
 #include "TextAttribute.hpp"
 
-class TextAttributeRun final
+class TextAttributeRun final : public std::pair<TextAttribute, unsigned int>
 {
 public:
-    TextAttributeRun() = default;
-    TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept :
-        _cchLength(gsl::narrow<unsigned int>(cchLength))
-    {
-        SetAttributes(attr);
-    }
+    using mybase = std::pair<TextAttribute, unsigned int>;
 
-    size_t GetLength() const noexcept { return _cchLength; }
-    void SetLength(const size_t cchLength) noexcept { _cchLength = gsl::narrow<unsigned int>(cchLength); }
-    void IncrementLength() noexcept { _cchLength++; }
-    void DecrementLength() noexcept { _cchLength--; }
+    using mybase::mybase;
 
-    const TextAttribute& GetAttributes() const noexcept { return _attributes; }
-    void SetAttributes(const TextAttribute textAttribute) noexcept { _attributes = textAttribute; }
+    TextAttributeRun(const size_t cchLength, const TextAttribute attr) :
+        mybase(attr, gsl::narrow<unsigned int>(cchLength))
+    {
+    }
 
-private:
-    unsigned int _cchLength{ 0 };
-    TextAttribute _attributes{ 0 };
+    size_t GetLength() const noexcept { return mybase::second; }
+    void SetLength(const size_t cchLength) noexcept { mybase::second = gsl::narrow<unsigned int>(cchLength); }
+    void IncrementLength() noexcept { mybase::second++; }
+    void DecrementLength() noexcept { mybase::second--; }
 
-#ifdef UNIT_TESTING
-    friend class AttrRowTests;
-#endif
+    const TextAttribute& GetAttributes() const noexcept { return mybase::first; }
+    void SetAttributes(const TextAttribute textAttribute) noexcept { mybase::first = textAttribute; }
 };

src/buffer/out/lib/bufferout.vcxproj

@@ -11,7 +11,6 @@
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
     <ClCompile Include="..\AttrRow.cpp" />
-    <ClCompile Include="..\AttrRowIterator.cpp" />
     <ClCompile Include="..\cursor.cpp" />
     <ClCompile Include="..\OutputCell.cpp" />
     <ClCompile Include="..\OutputCellIterator.cpp" />
@@ -35,7 +34,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\AttrRow.hpp" />
-    <ClInclude Include="..\AttrRowIterator.hpp" />
     <ClInclude Include="..\cursor.h" />
     <ClInclude Include="..\DbcsAttribute.hpp" />
     <ClInclude Include="..\ICharRow.hpp" />

src/buffer/out/textBufferCellIterator.hpp

@@ -15,8 +15,8 @@ Author(s):
 
 #pragma once
 
-#include "AttrRowIterator.hpp"
 #include "CharRow.hpp"
+#include "AttrRow.hpp"
 #include "OutputCellView.hpp"
 #include "../../types/inc/viewport.hpp"
 
@@ -55,7 +55,7 @@ class TextBufferCellIterator
     OutputCellView _view;
 
     const ROW* _pRow;
-    AttrRowIterator _attrIter;
+    ATTR_ROW::const_iterator _attrIter;
     const TextBuffer& _buffer;
     const Microsoft::Console::Types::Viewport _bounds;
     bool _exceeded;