Add new text_t based on char, rename prev to data_t.

Author: evoskuil

include/bitcoin/system/impl/stream/streamers/sha256t_writer.ipp

@@ -30,20 +30,20 @@ namespace system {
 // ----------------------------------------------------------------------------
 
 // protected
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 sha256t_writer<Tag, OStream>::sha256t_writer() NOEXCEPT
   : base(),
     context_(midstate(), one)
 {
 }
 
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 sha256t_writer<Tag, OStream>::sha256t_writer(OStream& sink) NOEXCEPT
   : base(sink), context_(midstate(), one)
 {
 }
 
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 sha256t_writer<Tag, OStream>::~sha256t_writer() NOEXCEPT
 {
     // Derived virtual destructor called before base destructor.
@@ -53,7 +53,7 @@ sha256t_writer<Tag, OStream>::~sha256t_writer() NOEXCEPT
 // protected
 // ----------------------------------------------------------------------------
 
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 void sha256t_writer<Tag, OStream>::do_write_bytes(const uint8_t* data,
     size_t size) NOEXCEPT
 {
@@ -62,7 +62,7 @@ void sha256t_writer<Tag, OStream>::do_write_bytes(const uint8_t* data,
     context_.write(size, data);
 }
 
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 void sha256t_writer<Tag, OStream>::do_flush() NOEXCEPT
 {
     flusher();
@@ -73,7 +73,7 @@ void sha256t_writer<Tag, OStream>::do_flush() NOEXCEPT
 // ----------------------------------------------------------------------------
 
 // static
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 constexpr sha256::state_t sha256t_writer<Tag, OStream>::midstate() NOEXCEPT
 {
     // Cache midstate of tagged hash part that does not change for a given tag.
@@ -85,7 +85,7 @@ constexpr sha256::state_t sha256t_writer<Tag, OStream>::midstate() NOEXCEPT
 
 // Only hash overflow returns update false, which requires (2^64-8)/8 bytes.
 // The stream could invalidate, but writers shouldn't have to check this.
-template <text_t Tag, typename OStream>
+template <data_t Tag, typename OStream>
 void sha256t_writer<Tag, OStream>::flusher() NOEXCEPT
 {
     hash_digest hash{};

include/bitcoin/system/literals.hpp

@@ -130,7 +130,7 @@ BC_POP_WARNING()
 /// Text representations.
 /// ---------------------------------------------------------------------------
 
-template <text_t Text>
+template <data_t Text>
 CONSTEVAL auto operator "" _array() noexcept
 {
     return Text.data;

include/bitcoin/system/stream/streamers.hpp

@@ -231,23 +231,23 @@ namespace hash
     namespace sha256t
     {
         /// A hash writer that writes a tagged sha256 hash to a std::ostream.
-        template <text_t Tag>
+        template <data_t Tag>
         using ostream = sha256t_writer<Tag, std::ostream>;
 
         /// A fast hash writer that writes a tagged sha256 hash to a system::ostream.
-        template <text_t Tag>
+        template <data_t Tag>
         using fast = sha256t_writer<Tag, system::ostream<>>;
 
         /////// A hash writer that copies a tagged sha256 hash to a data_slab.
-        ////template <text_t Tag>
+        ////template <data_t Tag>
         ////using copy = make_streamer<copy_sink<data_slab>, tag<Tag, sha256t_writer>::type>;
 
         /////// A hash writer that inserts a tagged sha256 hash into a container.
-        ////template <text_t Tag, typename Container>
+        ////template <data_t Tag, typename Container>
         ////using push = make_streamer<push_sink<Container>, tag<Tag, sha256t_writer>::type>;
-        ////template <text_t Tag>
+        ////template <data_t Tag>
         ////using text = push<Tag, std::string>;
-        ////template <text_t Tag>
+        ////template <data_t Tag>
         ////using data = push<Tag, data_chunk>;
     }
 }

include/bitcoin/system/stream/streamers/sha256t_writer.hpp

@@ -28,7 +28,7 @@ namespace libbitcoin {
 namespace system {
 
 /// A tagged hash writer that accepts an ostream.
-template <text_t Tag, typename OStream = std::ostream>
+template <data_t Tag, typename OStream = std::ostream>
 class sha256t_writer
   : public byte_writer<OStream>
 {

include/bitcoin/system/types.hpp

@@ -183,18 +183,18 @@ BC_PUSH_WARNING(NO_DYNAMIC_ARRAY_INDEXING)
 BC_PUSH_WARNING(NO_ARRAY_INDEXING)
 
 template <size_t Size>
-class text_t
+class data_t
 {
 public:
-    CONSTEVAL text_t(const char (&string)[Size]) noexcept
-      : data(to_array(string))
+    CONSTEVAL data_t(const char (&string)[Size]) noexcept
+      : data(to_data(string))
     {
     }
 
     const std::array<uint8_t, Size - 1> data;
 
 private:
-    static CONSTEVAL auto to_array(const char(&string)[Size]) noexcept
+    static CONSTEVAL auto to_data(const char(&string)[Size]) noexcept
     {
         std::array<uint8_t, Size - 1> out{};
         for (size_t index{}; index < Size - 1; ++index)
@@ -204,6 +204,31 @@ class text_t
     }
 };
 
+template <size_t Size>
+class text_t
+{
+public:
+    CONSTEVAL text_t(const char (&string)[Size]) noexcept
+      : text(to_text(string))
+    {
+    }
+
+    const std::array<char, Size - 1> text;
+
+private:
+    static CONSTEVAL auto to_text(const char(&string)[Size]) noexcept
+    {
+        std::array<char, Size - 1> out{};
+        for (size_t index{}; index < Size - 1; ++index)
+            out[index] = string[index];
+
+        return out;
+    }
+};
+
+template <size_t Size>
+data_t(const char(&)[Size]) noexcept -> data_t<Size>;
+
 template <size_t Size>
 text_t(const char(&)[Size]) noexcept -> text_t<Size>;