more template fiddling

duckstax · Nov 18, 2024 · 0254916 · 0254916
1 parent 6fc0d97
commit 0254916
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 88 deletions.
diff --git a/components/document/impl/tape_builder.cpp b/components/document/impl/tape_builder.cpp
@@ -19,18 +19,6 @@ namespace components::document {
     tape_builder::tape_builder(impl::base_document& doc) noexcept
         : tape_(doc) {}
 
-    void tape_builder::build(const std::string& value) {
-        // we advance the point, accounting for the fact that we have a NULL termination
-        append(tape_.next_string_buf_index(), types::physical_type::STRING);
-        tape_.append_string(value);
-    }
-
-    void tape_builder::build(const std::pmr::string& value) {
-        // we advance the point, accounting for the fact that we have a NULL termination
-        append(tape_.next_string_buf_index(), types::physical_type::STRING);
-        tape_.append_string(value);
-    }
-
     void tape_builder::visit_null_atom() noexcept { append(0, types::physical_type::NA); }
 
     void tape_builder::append(uint64_t val, types::physical_type t) noexcept {

diff --git a/components/document/impl/tape_builder.hpp b/components/document/impl/tape_builder.hpp
@@ -21,14 +21,9 @@ namespace components::document {
 
         tape_builder& operator=(const tape_builder&) = delete;
 
-        template<typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
-        void build(T value);
-        template<typename T, std::enable_if_t<!std::is_integral<T>::value, bool> = true>
+        template<typename T>
         void build(T value);
 
-        void build(const std::string& value);
-        void build(const std::pmr::string& value);
-
         void visit_null_atom() noexcept;
 
     private:
@@ -43,82 +38,50 @@ namespace components::document {
         void append3(T val2, types::physical_type t) noexcept;
     };
 
-    template<>
-    inline void tape_builder::build<>(std::string_view value) {
-        // we advance the point, accounting for the fact that we have a NULL termination
-        append(tape_.next_string_buf_index(), types::physical_type::STRING);
-        tape_.append_string(value);
-    }
-
-    template<>
-    inline void tape_builder::build<>(std::string value) {
-        // we advance the point, accounting for the fact that we have a NULL termination
-        append(tape_.next_string_buf_index(), types::physical_type::STRING);
-        tape_.append_string(value);
-    }
-
-    template<>
-    inline void tape_builder::build<>(std::pmr::string value) {
-        // we advance the point, accounting for the fact that we have a NULL termination
-        append(tape_.next_string_buf_index(), types::physical_type::STRING);
-        tape_.append_string(value);
-    }
-
-    template<typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
+    template<typename T>
     void tape_builder::build(T value) {
-        if constexpr (std::is_same_v<T, bool>) {
-            append(0, value ? types::physical_type::BOOL_TRUE : types::physical_type::BOOL_FALSE);
-        } else if constexpr (std::is_signed_v<T>) {
-            if constexpr (sizeof(T) == 1) {
-                append(value, types::physical_type::INT8);
-            } else if constexpr (sizeof(T) == 2) {
-                append(value, types::physical_type::INT16);
-            } else if constexpr (sizeof(T) == 4) {
-                append(value, types::physical_type::INT32);
-            } else if constexpr (sizeof(T) == 8) {
-                append2(0, value, types::physical_type::INT64);
-            }
-        } else if constexpr (std::is_unsigned_v<T>) {
-            if constexpr (sizeof(T) == 1) {
-                append(value, types::physical_type::UINT8);
-            } else if constexpr (sizeof(T) == 2) {
-                append(value, types::physical_type::UINT16);
-            } else if constexpr (sizeof(T) == 4) {
-                append(value, types::physical_type::UINT32);
-            } else if constexpr (sizeof(T) == 8) {
-                append(value, types::physical_type::UINT64);
-                tape_.append(value);
+        if constexpr (std::is_null_pointer_v<T>) {
+            visit_null_atom();
+        } else if constexpr (std::is_integral_v<T>) {
+            if constexpr (std::is_same_v<T, bool>) {
+                append(0, value ? types::physical_type::BOOL_TRUE : types::physical_type::BOOL_FALSE);
+            } else if constexpr (std::is_signed_v<T>) {
+                if constexpr (sizeof(T) == 1) {
+                    append(value, types::physical_type::INT8);
+                } else if constexpr (sizeof(T) == 2) {
+                    append(value, types::physical_type::INT16);
+                } else if constexpr (sizeof(T) == 4) {
+                    append(value, types::physical_type::INT32);
+                } else if constexpr (sizeof(T) == 8) {
+                    append2(0, value, types::physical_type::INT64);
+                }
+            } else if constexpr (std::is_unsigned_v<T>) {
+                if constexpr (sizeof(T) == 1) {
+                    append(value, types::physical_type::UINT8);
+                } else if constexpr (sizeof(T) == 2) {
+                    append(value, types::physical_type::UINT16);
+                } else if constexpr (sizeof(T) == 4) {
+                    append(value, types::physical_type::UINT32);
+                } else if constexpr (sizeof(T) == 8) {
+                    append(value, types::physical_type::UINT64);
+                    tape_.append(value);
+                }
             }
+        } else if constexpr (std::is_same_v<T, int128_t>) {
+            append3(value, types::physical_type::INT128);
+        } else if constexpr (std::is_same_v<T, float>) {
+            uint64_t tape_data;
+            std::memcpy(&tape_data, &value, sizeof(value));
+            append(tape_data, types::physical_type::FLOAT);
+        } else if constexpr (std::is_same_v<T, double>) {
+            append2(0, value, types::physical_type::DOUBLE);
         } else {
-            assert(false && "tape_builder: undefined type");
+            // we advance the point, accounting for the fact that we have a NULL termination
+            append(tape_.next_string_buf_index(), types::physical_type::STRING);
+            tape_.append_string(value);
         }
     }
 
-    template<>
-    inline void tape_builder::build<>(int128_t value) {
-        append3(value, types::physical_type::INT128);
-    }
-
-    // template <>
-    // inline void tape_builder::build<>(uint128_t value) {  append3(value, types::physical_type::INT128); }
-
-    template<>
-    inline void tape_builder::build<>(float value) {
-        uint64_t tape_data;
-        std::memcpy(&tape_data, &value, sizeof(value));
-        append(tape_data, types::physical_type::FLOAT);
-    }
-
-    template<>
-    inline void tape_builder::build<>(double value) {
-        append2(0, value, types::physical_type::DOUBLE);
-    }
-
-    template<>
-    inline void tape_builder::build<>(nullptr_t) {
-        visit_null_atom();
-    }
-
     template<typename T>
     void tape_builder::append2(uint64_t val, T val2, types::physical_type t) noexcept {
         append(val, t);