From 01f48a394d08277112d209d1a8064d7e80f88c4e Mon Sep 17 00:00:00 2001 From: rexy712 Date: Sat, 21 May 2022 12:36:26 -0700 Subject: [PATCH] Update rexylib --- rjp++/include/object.hpp | 24 ++++++++++++------------ rjp++/include/string_val.hpp | 4 ++-- rjp++/src/object.cpp | 20 ++++++++++---------- rjp++/src/string_val.cpp | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/rjp++/include/object.hpp b/rjp++/include/object.hpp index 6c71846..44c62b6 100644 --- a/rjp++/include/object.hpp +++ b/rjp++/include/object.hpp @@ -75,13 +75,13 @@ namespace rjp{ object& operator=(object&&) = default; template - member> add(const rexy::string_base& key, typename std::decay_t::underlying_type t){ + member> add(const rexy::string_view& key, typename std::decay_t::underlying_type t){ RJP_value* newmem = add_member_impl(key); detail::set_to_underlying>(newmem, t); return create_unmanaged(newmem); } template - member> add(const rexy::string_base& key){ + member> add(const rexy::string_view& key){ RJP_value* newmem = add_member_impl(key); if constexpr(std::is_same,rjp::array>::value) set_array_value(newmem); @@ -93,11 +93,11 @@ namespace rjp{ detail::set_to_underlying>(newmem, 0); return create_unmanaged(newmem); } - member add(const rexy::string_base& key, const RJP_string&); - member add(const rexy::string_base& key, RJP_string&&); - member add(const rexy::string_base& key, const char*, RJP_index len = 0); - member add(const rexy::string_base& key, const rexy::string_base&); - member add(const rexy::string_base& key, string&&); + member add(const rexy::string_view& key, const RJP_string&); + member add(const rexy::string_view& key, RJP_string&&); + member add(const rexy::string_view& key, const char*, RJP_index len = 0); + member add(const rexy::string_view& key, const rexy::string_view&); + member add(const rexy::string_view& key, string&&); template member> add(string&& key, typename std::decay_t::underlying_type t){ @@ -121,13 +121,13 @@ namespace rjp{ member add(string&& key, const RJP_string&); member add(string&& key, RJP_string&&); member add(string&& key, const char*, RJP_index len = 0); - member add(string&& key, const rexy::string_base&); + member add(string&& key, const rexy::string_view&); member add(string&& key, string&&); - value remove(const rexy::string_base& key); + value remove(const rexy::string_view& key); value& remove(value& val); - void destroy(const rexy::string_base& key); + void destroy(const rexy::string_view& key); void destroy(value&& val); bool has_child(const value&); @@ -142,10 +142,10 @@ namespace rjp{ size_type size(void)const; - value search(const rexy::string_base& key)const; + value search(const rexy::string_view& key)const; private: - RJP_value* add_member_impl(const rexy::string_base& key); + RJP_value* add_member_impl(const rexy::string_view& key); RJP_value* add_member_impl(string&& key); }; diff --git a/rjp++/include/string_val.hpp b/rjp++/include/string_val.hpp index 9e797c3..cc3f13c 100644 --- a/rjp++/include/string_val.hpp +++ b/rjp++/include/string_val.hpp @@ -20,7 +20,7 @@ #define RJP_STRING_VAL_HPP #include -#include +#include #include "string.hpp" #include "value.hpp" @@ -32,7 +32,7 @@ namespace rjp{ using underlying_type = RJP_string; public: using value::value; - string_val(const rexy::string_base& str); + string_val(const rexy::string_view& str); string_val(string&& str); string_val(void); string_val(const value& val); diff --git a/rjp++/src/object.cpp b/rjp++/src/object.cpp index d3485a0..ff1ef67 100644 --- a/rjp++/src/object.cpp +++ b/rjp++/src/object.cpp @@ -39,27 +39,27 @@ namespace rjp{ if(rjp_value_type(m_value) != rjp_json_object) rjp_set_object(m_value); } - member object::add(const rexy::string_base& key, const RJP_string& s){ + member object::add(const rexy::string_view& key, const RJP_string& s){ RJP_value* newmem = rjp_new_member(m_value, key.get(), key.length()); rjp_set_string(newmem, s.value, s.length); return create_unmanaged(newmem); } - member object::add(const rexy::string_base& key, RJP_string&& s){ + member object::add(const rexy::string_view& key, RJP_string&& s){ RJP_value* newmem = rjp_new_member(m_value, key.get(), key.length()); rjp_set_string_steal(newmem, s.value, s.length); return create_unmanaged(newmem); } - member object::add(const rexy::string_base& key, const char* s, RJP_index len){ + member object::add(const rexy::string_view& key, const char* s, RJP_index len){ RJP_value* newmem = rjp_new_member(m_value, key.get(), key.length()); rjp_set_string(newmem, s, len); return create_unmanaged(newmem); } - member object::add(const rexy::string_base& key, const rexy::string_base& s){ + member object::add(const rexy::string_view& key, const rexy::string_view& s){ RJP_value* newmem = rjp_new_member(m_value, key.get(), key.length()); rjp_set_string(newmem, s.get(), s.length()); return create_unmanaged(newmem); } - member object::add(const rexy::string_base& key, string&& s){ + member object::add(const rexy::string_view& key, string&& s){ RJP_value* newmem = rjp_new_member(m_value, key.get(), key.length()); auto len = s.length(); rjp_set_string_steal(newmem, s.release(), len); @@ -81,7 +81,7 @@ namespace rjp{ rjp_set_string(newmem, s, len); return create_unmanaged(newmem); } - member object::add(string&& key, const rexy::string_base& s){ + member object::add(string&& key, const rexy::string_view& s){ RJP_value* newmem = rjp_new_member_steal_key(m_value, key.get(), key.length()); rjp_set_string(newmem, s.get(), s.length()); return create_unmanaged(newmem); @@ -93,7 +93,7 @@ namespace rjp{ return create_unmanaged(newmem); } - value object::remove(const rexy::string_base& key){ + value object::remove(const rexy::string_view& key){ RJP_value* removed = rjp_remove_member_by_key(m_value, key.get()); return create_managed(removed); } @@ -103,7 +103,7 @@ namespace rjp{ return val; } - void object::destroy(const rexy::string_base& key){ + void object::destroy(const rexy::string_view& key){ rjp_free_member_by_key(m_value, key.get()); } void object::destroy(value&& val){ @@ -134,12 +134,12 @@ namespace rjp{ object::size_type object::size(void)const{ return rjp_num_members(m_value); } - value object::search(const rexy::string_base& key)const{ + value object::search(const rexy::string_view& key)const{ RJP_value* result = rjp_search_member(m_value, key.get()); return create_unmanaged(result); } - RJP_value* object::add_member_impl(const rexy::string_base& key){ + RJP_value* object::add_member_impl(const rexy::string_view& key){ return rjp_new_member(m_value, key.get(), key.length()); } RJP_value* object::add_member_impl(string&& key){ diff --git a/rjp++/src/string_val.cpp b/rjp++/src/string_val.cpp index b518332..0141d46 100644 --- a/rjp++/src/string_val.cpp +++ b/rjp++/src/string_val.cpp @@ -22,7 +22,7 @@ namespace rjp{ - string_val::string_val(const rexy::string_base& str): + string_val::string_val(const rexy::string_view& str): value(rjp_new_string(str.get(), str.length()), true){} string_val::string_val(string&& str): value(rjp_new_string_steal(str.get(), str.length()), true)