update json and uninitialized

wjr-z · Aug 8, 2024 · bf0fe59 · bf0fe59
1 parent c5b426e
commit bf0fe59
Show file tree

Hide file tree

Showing 6 changed files with 741 additions and 70 deletions.
diff --git a/include/wjr/container/generic/vector.hpp b/include/wjr/container/generic/vector.hpp
@@ -501,10 +501,10 @@ class basic_vector {
         typename std::allocator_traits<allocator_type>::template rebind_alloc<value_type>;
     using _Alty_traits = std::allocator_traits<_Alty>;
 
-    using storage_fn_type = container_fn<_Alty>;
     using __get_size_t = decltype(std::declval<storage_type>().size());
     using IteratorTraits = basic_vector_traits<storage_type>;
 
+    using storage_fn_type = container_fn<_Alty>;
     friend class container_fn<_Alty>;
 
     template <typename T>

diff --git a/include/wjr/json/detail.hpp b/include/wjr/json/detail.hpp
@@ -48,39 +48,31 @@ template <typename T>
 using result = expected<T, result_error>;
 
 enum class value_t : uint8_t {
+    null,
+    boolean,
     number_unsigned,
     number_signed,
     number_float,
-    null,
-    boolean,
     string,
     object,
     array,
 };
 
 using number_unsigned_t = integral_constant<value_t, value_t::number_unsigned>;
-inline constexpr number_unsigned_t number_unsigned_v = {};
 
 using number_signed_t = integral_constant<value_t, value_t::number_signed>;
-inline constexpr number_signed_t number_signed_v = {};
 
 using number_float_t = integral_constant<value_t, value_t::number_float>;
-inline constexpr number_float_t number_float_v = {};
 
 using null_t = integral_constant<value_t, value_t::null>;
-inline constexpr null_t null_v = {};
 
 using boolean_t = integral_constant<value_t, value_t::boolean>;
-inline constexpr boolean_t boolean_v = {};
 
 using string_t = integral_constant<value_t, value_t::string>;
-inline constexpr string_t string_v = {};
 
 using object_t = integral_constant<value_t, value_t::object>;
-inline constexpr object_t object_v = {};
 
 using array_t = integral_constant<value_t, value_t::array>;
-inline constexpr array_t array_v = {};
 
 struct basic_value {
     basic_value() = default;
@@ -92,26 +84,25 @@ struct basic_value {
 
     basic_value(null_t) noexcept : m_type(value_t::null) {}
     basic_value(boolean_t, bool f) noexcept : m_boolean(f), m_type(value_t::boolean) {}
-    basic_value(number_signed_t, int64_t value) noexcept
-        : m_number_signed(value), m_type(value_t::number_signed) {}
     basic_value(number_unsigned_t, uint64_t value) noexcept
         : m_number_unsigned(value), m_type(value_t::number_signed) {}
+    basic_value(number_signed_t, int64_t value) noexcept
+        : m_number_signed(value), m_type(value_t::number_signed) {}
     basic_value(number_float_t, double value) noexcept
         : m_number_float(value), m_type(value_t::number_float) {}
     basic_value(string_t, void *ptr) noexcept : m_ptr(ptr), m_type(value_t::string) {}
     basic_value(object_t, void *ptr) noexcept : m_ptr(ptr), m_type(value_t::object) {}
     basic_value(array_t, void *ptr) noexcept : m_ptr(ptr), m_type(value_t::array) {}
 
     union {
+        bool m_boolean;
         uint64_t m_number_unsigned;
         int64_t m_number_signed;
         double m_number_float;
-        std::nullptr_t m_null;
-        bool m_boolean;
         void *m_ptr;
     };
 
-    value_t m_type;
+    value_t m_type = value_t::null;
 };
 
 } // namespace wjr::json

diff --git a/include/wjr/json/document.hpp b/include/wjr/json/document.hpp