From a3ea13fc0399c9e863b1913f627946fac9e1903b Mon Sep 17 00:00:00 2001 From: rexy712 Date: Sun, 20 Mar 2022 14:17:04 -0700 Subject: [PATCH] Update to newer rexylib --- rjp++/include/member.hpp | 8 ++++---- rjp++/include/string_val.hpp | 2 +- rjp++/include/value.hpp | 2 +- rjp++/src/string_val.cpp | 6 +++--- rjp++/src/vget_proxy.cpp | 2 +- rjp++/tests/output.cpp | 32 ++++++++++++++++---------------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/rjp++/include/member.hpp b/rjp++/include/member.hpp index 81231b1..b9cd2a0 100644 --- a/rjp++/include/member.hpp +++ b/rjp++/include/member.hpp @@ -52,8 +52,8 @@ namespace rjp{ member& operator=(const member&) = default; member& operator=(member&&) = default; - rexy::static_string key(void)const{ - return rexy::static_string(member_key(this->m_value)->value, member_key(this->m_value)->length); + rexy::string_view key(void)const{ + return rexy::string_view(member_key(this->m_value)->value, member_key(this->m_value)->length); } string steal_key(void){ return string(this->m_value); @@ -76,8 +76,8 @@ namespace rjp{ member& operator=(const member&) = default; member& operator=(member&&) = default; - rexy::static_string key(void)const{ - return rexy::static_string(member_key(m_value)->value, member_key(m_value)->length); + rexy::string_view key(void)const{ + return rexy::string_view(member_key(m_value)->value, member_key(m_value)->length); } string steal_key(void){ return string(m_value); diff --git a/rjp++/include/string_val.hpp b/rjp++/include/string_val.hpp index aca42db..8470e74 100644 --- a/rjp++/include/string_val.hpp +++ b/rjp++/include/string_val.hpp @@ -48,7 +48,7 @@ namespace rjp{ string_val& operator=(const string_val&) = default; string_val& operator=(string_val&&) = default; - rexy::static_string get(void)const; + rexy::string_view get(void)const; string steal(void); void set(const rexy::string_base& str); void set(string&& str); diff --git a/rjp++/include/value.hpp b/rjp++/include/value.hpp index 250584d..b4e87f2 100644 --- a/rjp++/include/value.hpp +++ b/rjp++/include/value.hpp @@ -35,7 +35,7 @@ namespace rjp{ vget_proxy(const rjp::value* v); operator int(void)const; operator bool(void)const; - operator rexy::static_string(void)const; + operator rexy::string_view(void)const; operator double(void)const; }; } diff --git a/rjp++/src/string_val.cpp b/rjp++/src/string_val.cpp index 9016c97..a4244f6 100644 --- a/rjp++/src/string_val.cpp +++ b/rjp++/src/string_val.cpp @@ -30,7 +30,7 @@ namespace rjp{ str.release(); } string_val::string_val(void): - string_val(""_ss){} + string_val(""_sv){} string_val::string_val(const value& val): value(val) { @@ -70,9 +70,9 @@ namespace rjp{ rjp_set_string_steal(m_value, i.release(), length); } - rexy::static_string string_val::get(void)const{ + rexy::string_view string_val::get(void)const{ const RJP_string* str = rjp_get_cstring(m_value); - return rexy::static_string(str->value, str->length); + return rexy::string_view(str->value, str->length); } string string_val::steal(void){ return string(m_value); diff --git a/rjp++/src/vget_proxy.cpp b/rjp++/src/vget_proxy.cpp index daef431..e1a4c6a 100644 --- a/rjp++/src/vget_proxy.cpp +++ b/rjp++/src/vget_proxy.cpp @@ -32,7 +32,7 @@ namespace rjp::detail{ vget_proxy::operator bool(void)const{ return rjp::borrow_as(*m_value).get(); } - vget_proxy::operator rexy::static_string(void)const{ + vget_proxy::operator rexy::string_view(void)const{ return rjp::borrow_as(*m_value).get(); } vget_proxy::operator double(void)const{ diff --git a/rjp++/tests/output.cpp b/rjp++/tests/output.cpp index d9c5d34..4d4128a 100644 --- a/rjp++/tests/output.cpp +++ b/rjp++/tests/output.cpp @@ -34,30 +34,30 @@ rjp::value case_6(void){ //handle object with member rjp::value case_8(void){ rjp::object obj; - obj.add("key"_ss, 7); + obj.add("key"_sv, 7); return rjp::steal_as(obj); } //handle object with subobject rjp::value case_9(void){ rjp::object obj; - rjp::object sub = obj.add("key"_ss); - sub.add("subkey"_ss, false); + rjp::object sub = obj.add("key"_sv); + sub.add("subkey"_sv, false); return rjp::steal_as(obj); } //handle object with multiple members rjp::value case_10(void){ rjp::object obj; - rjp::object sub = obj.add("key"_ss); - sub.add("subkey"_ss, false); - sub.add("subkey2"_ss, true); + rjp::object sub = obj.add("key"_sv); + sub.add("subkey"_sv, false); + sub.add("subkey2"_sv, true); return rjp::steal_as(obj); } //handle object member ordering rjp::value case_11(void){ rjp::object obj; - rjp::object sub = obj.add("key"_ss); - sub.add("subkey2"_ss, true); - sub.add("subkey"_ss, false); + rjp::object sub = obj.add("key"_sv); + sub.add("subkey2"_sv, true); + sub.add("subkey"_sv, false); return rjp::steal_as(obj); } //handle orderedobject member ordering @@ -112,7 +112,7 @@ rjp::value case_18(void){ rjp::array arr; arr.add(5); rjp::object subobj = arr.add(); - rjp::array subarr = subobj.add("key"_ss); + rjp::array subarr = subobj.add("key"_sv); subarr.add(false); return rjp::steal_as(arr); } @@ -123,7 +123,7 @@ rjp::value case_19(void){ arr.add(5); rjp::object subobj = arr.add(); for(int i = 0;i < 10;++i){ - subobj.add(rexy::static_string(c), i % 2 == 0); + subobj.add(rexy::string_view(c), i % 2 == 0); c[3] += 1; } return rjp::steal_as(arr); @@ -148,7 +148,7 @@ rjp::value case_19(void){ //handle array with many element as object member rjp::value case_21(void){ rjp::object obj; - rjp::array arr = obj.add("arr"_ss); + rjp::array arr = obj.add("arr"_sv); for(int i = 0;i < 10;++i) arr.add(i); return rjp::steal_as(obj); @@ -196,19 +196,19 @@ RJP_value* case_25(void){ } */ rjp::value case_26(void){ - return rjp::string_val("string"_ss); + return rjp::string_val("string"_sv); } rjp::value case_27(void){ - return rjp::string_val(""_ss); + return rjp::string_val(""_sv); } rjp::value case_28(void){ rjp::object obj; - obj.add("key"_ss, "string"_ss); + obj.add("key"_sv, "string"_sv); return rjp::steal_as(obj); } rjp::value case_29(void){ rjp::object obj; - obj.add("key"_ss, ""_ss); + obj.add("key"_sv, ""_sv); return rjp::steal_as(obj); }