wip nicer symbol-bitsize ctor

Change-Id: I50f7ea63561de0bb785c85467cdb943829b65edf

huffman/BUILD.bazel

@@ -8,11 +8,14 @@ cc_library(
         "src/code.hpp",
         "src/decode.hpp",
         "src/detail/element_base_iterator.hpp",
+        "src/detail/flattened_symbol_bitsize_view.hpp",
+        "src/detail/is_specialization_of.hpp",
         "src/detail/iterator_interface.hpp",
         "src/detail/static_vector.hpp",
         "src/detail/table_node.hpp",
         "src/detail/table_storage.hpp",
         "src/encoding.hpp",
+        "src/symbol_span.hpp",
         "src/table.hpp",
         "src/utility.hpp",
     ],

huffman/src/decode.hpp

@@ -2,6 +2,7 @@
 #include "huffman/src/bit_span.hpp"
 #include "huffman/src/code.hpp"
 #include "huffman/src/table.hpp"
+#include "huffman/src/utility.hpp"
 
 #include <iterator>
 
@@ -20,7 +21,7 @@ namespace starflate::huffman {
 /// @tparam Extent The extent of the code table.
 /// @tparam O The type of the output iterator.
 template <
-    std::regular Symbol,
+    symbol Symbol,
     std::size_t Extent = std::dynamic_extent,
     std::output_iterator<Symbol> O>
 constexpr auto

huffman/src/detail/flattened_symbol_bitsize_view.hpp

@@ -0,0 +1,122 @@
+#pragma once
+
+#include "huffman/src/detail/iterator_interface.hpp"
+
+#include <cstddef>
+#include <iterator>
+#include <numeric>
+#include <ranges>
+
+namespace starflate::huffman::detail {
+
+template <std::ranges::view V>
+class flattened_symbol_bitsize_view
+    : public std::ranges::view_interface<flattened_symbol_bitsize_view<V>>
+{
+  V base_;
+  std::size_t size_;
+
+  using child_view_type = std::remove_cvref_t<std::ranges::range_value_t<V>>;
+
+public:
+  using base_type = V;
+
+  class iterator
+  {
+    const flattened_symbol_bitsize_view* parent_;
+    std::size_t offset1_;
+    std::size_t offset2_;
+
+  public:
+    using iterator_category = std::forward_iterator_tag;
+    using difference_type = std::ranges::range_difference_t<child_view_type>;
+    using value_type = std::ranges::range_value_t<child_view_type>;
+    using reference = std::ranges::range_reference_t<child_view_type>;
+    using pointer = void;
+
+    iterator() = default;
+
+    constexpr iterator(
+        const flattened_symbol_bitsize_view& parent,
+        std::size_t offset1,
+        std::size_t offset2)
+        : parent_{&parent}, offset1_{offset1}, offset2_{offset2}
+    {}
+
+    [[nodiscard]]
+    constexpr auto
+    operator*() const -> reference
+    {
+      using D = difference_type;
+      return parent_
+          ->base()[static_cast<D>(offset1_)][static_cast<D>(offset2_)];
+    }
+
+    constexpr auto operator++() & -> iterator&
+    {
+      using D = difference_type;
+
+      if (++offset2_ ==
+          static_cast<std::size_t>(
+              parent_->base()[static_cast<D>(offset1_)].size())) {
+        ++offset1_;
+        offset2_ = {};
+      }
+
+      return *this;
+    }
+
+    constexpr auto operator++(int) -> iterator
+    {
+      auto tmp = *this;
+      ++*this;
+      return tmp;
+    }
+
+    friend constexpr auto
+    operator==(const iterator&, const iterator&) -> bool = default;
+  };
+
+  constexpr explicit flattened_symbol_bitsize_view(V base)
+      : base_{std::move(base)},
+        size_{std::accumulate(
+            std::ranges::cbegin(base_),
+            std::ranges::cend(base_),
+            0UZ,
+            [](auto acc, const auto& subrange) {
+              return acc + subrange.size();
+            })}
+  {}
+
+  [[nodiscard]]
+  constexpr auto base() const -> base_type
+  {
+    return base_;
+  }
+
+  [[nodiscard]]
+  constexpr auto size() const -> std::size_t
+  {
+    return size_;
+  }
+
+  [[nodiscard]]
+  constexpr auto begin() const -> iterator
+  {
+    return {*this, 0, 0};
+  }
+
+  [[nodiscard]]
+  constexpr auto end() const -> iterator
+  {
+    return {*this, base().size(), 0};
+  }
+};
+
+}  // namespace starflate::huffman::detail
+
+// flattened_symbol_bitsize_view is only created to adapt an input range during
+// construction
+template <class V>
+inline constexpr bool std::ranges::enable_borrowed_range<
+    ::starflate::huffman::detail::flattened_symbol_bitsize_view<V>> = true;

huffman/src/detail/is_specialization_of.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <type_traits>
+
+namespace starflate::huffman::detail {
+
+/// Checks if a type is a specialization of a class template
+/// @tparam T type
+/// @tparam primary class template
+///
+/// @see https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2098r1.pdf
+///
+///
+
+template <class T, template <class...> class primary>
+struct is_specialization_of : std::false_type
+{};
+
+template <template <class...> class primary, class... Args>
+struct is_specialization_of<primary<Args...>, primary> : std::true_type
+{};
+
+template <class T, template <class...> class primary>
+inline constexpr auto is_specialization_of_v =
+    is_specialization_of<T, primary>::value;
+
+}  // namespace starflate::huffman::detail

huffman/src/encoding.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "huffman/src/code.hpp"
+#include "huffman/src/utility.hpp"
 
 #include <concepts>
 #include <ostream>
@@ -12,8 +13,7 @@ namespace starflate::huffman {
 /// This type associates a symbol to a code. It is typically constructed and
 /// updated as part of the construction of a table.
 ///
-template <std::regular Symbol>
-  requires std::totally_ordered<Symbol>
+template <symbol Symbol>
 struct encoding : code
 {
   using symbol_type = Symbol;

huffman/src/symbol_span.hpp

@@ -0,0 +1,59 @@
+#pragma once
+
+#include "huffman/src/utility.hpp"
+
+#include <concepts>
+#include <ranges>
+
+namespace starflate::huffman {
+
+/// An inclusive span of symbols
+///
+template <symbol S>
+class symbol_span : public std::ranges::view_interface<symbol_span<S>>
+{
+  S first_;
+  S last_;
+
+  using range_type = std::ranges::iota_view<S, S>;
+
+  constexpr auto as_range() const -> range_type
+  {
+    auto tmp = last_;
+    return {first_, ++tmp};
+  }
+
+public:
+  using symbol_type = S;
+
+  using iterator = std::ranges::iterator_t<range_type>;
+
+  /// Construct a symbol span of a single symbol
+  /// @param first symbol
+  ///
+  constexpr symbol_span(symbol_type first) : symbol_span{first, first} {}
+
+  /// Construct a symbol span from first to last, inclusive
+  /// @param first, last inclusive symbol range
+  /// @pre first <= last
+  ///
+  constexpr symbol_span(symbol_type first, symbol_type last)
+      : first_{first}, last_{last}
+  {
+    assert(first <= last);
+  }
+
+  [[nodiscard]]
+  constexpr auto begin() const -> iterator
+  {
+    return as_range().begin();
+  }
+
+  [[nodiscard]]
+  constexpr auto end() const -> iterator
+  {
+    return as_range().end();
+  }
+};
+
+}  // namespace starflate::huffman

huffman/src/table.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
 #include "huffman/src/detail/element_base_iterator.hpp"
+#include "huffman/src/detail/flattened_symbol_bitsize_view.hpp"
+#include "huffman/src/detail/is_specialization_of.hpp"
 #include "huffman/src/detail/table_node.hpp"
 #include "huffman/src/detail/table_storage.hpp"
+#include "huffman/src/symbol_span.hpp"
 #include "huffman/src/utility.hpp"
 
 #include <algorithm>
@@ -57,10 +60,19 @@ constexpr static auto find_node_if(I first, I last, P pred)
 template <class R>
 constexpr auto to_code_symbol(const R& rng)
 {
-  return std::views::transform(rng, [](const auto& elem) {
-    const auto& [symbol, bitsize] = elem;
-    return std::tuple{code{bitsize, {}}, symbol};
-  });
+  static constexpr auto convert_with = [](auto bitsize) {
+    return [bitsize](auto symbol) {
+      return std::tuple{code{bitsize, {}}, symbol};
+    };
+  };
+
+  static constexpr auto expand = [](const auto& elem) {
+    const auto& [symbols, bitsize] = elem;
+    static_assert(std::ranges::view<std::remove_cvref_t<decltype(symbols)>>);
+    return std::views::transform(symbols, convert_with(bitsize));
+  };
+
+  return flattened_symbol_bitsize_view{std::views::transform(rng, expand)};
 }
 
 }  // namespace detail
@@ -76,8 +88,7 @@ constexpr auto to_code_symbol(const R& rng)
 /// `std::array` is used to store the Huffman tree, with the size determined by
 /// `Extent`.
 ///
-template <std::regular Symbol, std::size_t Extent = std::dynamic_extent>
-  requires std::totally_ordered<Symbol>
+template <symbol Symbol, std::size_t Extent = std::dynamic_extent>
 class table
 {
   using node_type = detail::table_node<Symbol>;
@@ -235,11 +246,6 @@ class table
   ///
   /// @{
 
-  template <std::ranges::input_range R>
-    requires std::convertible_to<std::ranges::range_reference_t<R>, symbol_type>
-  constexpr explicit table(const R& data) : table{data, {}}
-  {}
-
   template <std::ranges::input_range R>
     requires std::convertible_to<std::ranges::range_reference_t<R>, symbol_type>
   constexpr explicit table(const R& data, std::optional<symbol_type> eot)
@@ -249,6 +255,11 @@ class table
     set_skip_fields();
   }
 
+  template <std::ranges::input_range R>
+    requires std::convertible_to<std::ranges::range_reference_t<R>, symbol_type>
+  constexpr explicit table(const R& data) : table{data, {}}
+  {}
+
   /// @}
 
   /// Constructs a `table` from the given code-symbol mapping contents
@@ -278,10 +289,8 @@ class table
   template <std::size_t N>
   constexpr table(
       table_contents_tag, const c_array<std::pair<code, symbol_type>, N>& map)
-      : table_{table_contents, map}
-  {
-    set_skip_fields();
-  }
+      : table{table_contents, std::ranges::ref_view{map}}
+  {}
 
   /// @}
 
@@ -294,10 +303,10 @@ class table
   ///
   /// @{
 
-  template <std::ranges::sized_range R>
+  template <std::ranges::random_access_range R>
     requires std::convertible_to<
         std::ranges::range_reference_t<R>,
-        std::tuple<symbol_type, std::uint8_t>>
+        std::tuple<symbol_span<symbol_type>, std::uint8_t>>
   constexpr table(symbol_bitsize_tag, const R& map)
       : table{table_contents, detail::to_code_symbol(map)}
   {
@@ -307,11 +316,9 @@ class table
   template <std::size_t N>
   constexpr table(
       symbol_bitsize_tag,
-      const c_array<std::pair<symbol_type, std::uint8_t>, N>& map)
-      : table{table_contents, detail::to_code_symbol(map)}
-  {
-    canonicalize();
-  }
+      const c_array<std::pair<symbol_span<symbol_type>, std::uint8_t>, N>& map)
+      : table{symbol_bitsize, std::ranges::ref_view{map}}
+  {}
 
   /// @}
 
@@ -511,11 +518,17 @@ table(table_contents_tag, const R&)
     -> table<detail::tuple_arg_t<1, R>, detail::tuple_size_v<R>()>;
 
 template <class S, class I, std::size_t N>
+  requires (not detail::is_specialization_of_v<S, symbol_span>)
 table(symbol_bitsize_tag, const c_array<std::pair<S, I>, N>&) -> table<S, N>;
 
 template <class R>
-  requires (detail::tuple_size_v<std::ranges::range_value_t<R>>() == 2)
-table(symbol_bitsize_tag, const R&)
-    -> table<detail::tuple_arg_t<0, R>, detail::tuple_size_v<R>()>;
+  requires (
+      detail::tuple_size_v<std::ranges::range_value_t<R>>() == 2 and
+      detail::is_specialization_of_v<
+          std::tuple_element_t<0, std::ranges::range_value_t<R>>,
+          symbol_span>)
+table(symbol_bitsize_tag, const R&) -> table<
+    typename detail::tuple_arg_t<0, R>::symbol_type,
+    detail::tuple_size_v<R>()>;
 
 }  // namespace starflate::huffman