rexy712/rjp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Update to newer rexylib

Browse Source
This commit is contained in:
rexy712 2022-03-20 14:17:04 -07:00
parent 0d9cebedc0
commit a3ea13fc03
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rjp++/include/member.hpp
View File

@ -52,8 +52,8 @@ namespace rjp{
member& operator=(const member&) = default; member& operator=(const member&) = default;
member& operator=(member&&) = default; member& operator=(member&&) = default;
rexy::static_string<char> key(void)const{ rexy::string_view<char> key(void)const{
return rexy::static_string<char>(member_key(this->m_value)->value, member_key(this->m_value)->length); return rexy::string_view<char>(member_key(this->m_value)->value, member_key(this->m_value)->length);
} }
string steal_key(void){ string steal_key(void){
return string(this->m_value); return string(this->m_value);
@ -76,8 +76,8 @@ namespace rjp{
member& operator=(const member&) = default; member& operator=(const member&) = default;
member& operator=(member&&) = default; member& operator=(member&&) = default;
rexy::static_string<char> key(void)const{ rexy::string_view<char> key(void)const{
return rexy::static_string<char>(member_key(m_value)->value, member_key(m_value)->length); return rexy::string_view<char>(member_key(m_value)->value, member_key(m_value)->length);
} }
string steal_key(void){ string steal_key(void){
return string(m_value); return string(m_value);

2
rjp++/include/string_val.hpp
View File

@ -48,7 +48,7 @@ namespace rjp{
string_val& operator=(const string_val&) = default; string_val& operator=(const string_val&) = default;
string_val& operator=(string_val&&) = default; string_val& operator=(string_val&&) = default;
rexy::static_string<char> get(void)const; rexy::string_view<char> get(void)const;
string steal(void); string steal(void);
void set(const rexy::string_base<char>& str); void set(const rexy::string_base<char>& str);
void set(string&& str); void set(string&& str);

2
rjp++/include/value.hpp
View File

@ -35,7 +35,7 @@ namespace rjp{
vget_proxy(const rjp::value* v); vget_proxy(const rjp::value* v);
operator int(void)const; operator int(void)const;
operator bool(void)const; operator bool(void)const;
operator rexy::static_string<char>(void)const; operator rexy::string_view<char>(void)const;
operator double(void)const; operator double(void)const;
}; };
} }

6
rjp++/src/string_val.cpp
View File

@ -30,7 +30,7 @@ namespace rjp{
str.release(); str.release();
} }
string_val::string_val(void): string_val::string_val(void):
string_val(""_ss){} string_val(""_sv){}
string_val::string_val(const value& val): string_val::string_val(const value& val):
value(val) value(val)
{ {
@ -70,9 +70,9 @@ namespace rjp{
rjp_set_string_steal(m_value, i.release(), length); rjp_set_string_steal(m_value, i.release(), length);
} }
rexy::static_string<char> string_val::get(void)const{ rexy::string_view<char> string_val::get(void)const{
const RJP_string* str = rjp_get_cstring(m_value); const RJP_string* str = rjp_get_cstring(m_value);
return rexy::static_string<char>(str->value, str->length); return rexy::string_view<char>(str->value, str->length);
} }
string string_val::steal(void){ string string_val::steal(void){
return string(m_value); return string(m_value);

2
rjp++/src/vget_proxy.cpp
View File

@ -32,7 +32,7 @@ namespace rjp::detail{
vget_proxy::operator bool(void)const{ vget_proxy::operator bool(void)const{
return rjp::borrow_as<rjp::boolean>(*m_value).get(); return rjp::borrow_as<rjp::boolean>(*m_value).get();
} }
vget_proxy::operator rexy::static_string<char>(void)const{ vget_proxy::operator rexy::string_view<char>(void)const{
return rjp::borrow_as<rjp::string_val>(*m_value).get(); return rjp::borrow_as<rjp::string_val>(*m_value).get();
} }
vget_proxy::operator double(void)const{ vget_proxy::operator double(void)const{

32
rjp++/tests/output.cpp
View File

@ -34,30 +34,30 @@ rjp::value case_6(void){
//handle object with member //handle object with member
rjp::value case_8(void){ rjp::value case_8(void){
rjp::object obj; rjp::object obj;
obj.add<rjp::integer>("key"_ss, 7); obj.add<rjp::integer>("key"_sv, 7);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }
//handle object with subobject //handle object with subobject
rjp::value case_9(void){ rjp::value case_9(void){
rjp::object obj; rjp::object obj;
rjp::object sub = obj.add<rjp::object>("key"_ss); rjp::object sub = obj.add<rjp::object>("key"_sv);
sub.add<rjp::boolean>("subkey"_ss, false); sub.add<rjp::boolean>("subkey"_sv, false);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }
//handle object with multiple members //handle object with multiple members
rjp::value case_10(void){ rjp::value case_10(void){
rjp::object obj; rjp::object obj;
rjp::object sub = obj.add<rjp::object>("key"_ss); rjp::object sub = obj.add<rjp::object>("key"_sv);
sub.add<rjp::boolean>("subkey"_ss, false); sub.add<rjp::boolean>("subkey"_sv, false);
sub.add<rjp::boolean>("subkey2"_ss, true); sub.add<rjp::boolean>("subkey2"_sv, true);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }
//handle object member ordering //handle object member ordering
rjp::value case_11(void){ rjp::value case_11(void){
rjp::object obj; rjp::object obj;
rjp::object sub = obj.add<rjp::object>("key"_ss); rjp::object sub = obj.add<rjp::object>("key"_sv);
sub.add<rjp::boolean>("subkey2"_ss, true); sub.add<rjp::boolean>("subkey2"_sv, true);
sub.add<rjp::boolean>("subkey"_ss, false); sub.add<rjp::boolean>("subkey"_sv, false);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }
//handle orderedobject member ordering //handle orderedobject member ordering
@ -112,7 +112,7 @@ rjp::value case_18(void){
rjp::array arr; rjp::array arr;
arr.add<rjp::integer>(5); arr.add<rjp::integer>(5);
rjp::object subobj = arr.add<rjp::object>(); rjp::object subobj = arr.add<rjp::object>();
rjp::array subarr = subobj.add<rjp::array>("key"_ss); rjp::array subarr = subobj.add<rjp::array>("key"_sv);
subarr.add<rjp::boolean>(false); subarr.add<rjp::boolean>(false);
return rjp::steal_as<rjp::value>(arr); return rjp::steal_as<rjp::value>(arr);
} }
@ -123,7 +123,7 @@ rjp::value case_19(void){
arr.add<rjp::integer>(5); arr.add<rjp::integer>(5);
rjp::object subobj = arr.add<rjp::object>(); rjp::object subobj = arr.add<rjp::object>();
for(int i = 0;i < 10;++i){ for(int i = 0;i < 10;++i){
subobj.add<rjp::boolean>(rexy::static_string<char>(c), i % 2 == 0); subobj.add<rjp::boolean>(rexy::string_view<char>(c), i % 2 == 0);
c[3] += 1; c[3] += 1;
} }
return rjp::steal_as<rjp::value>(arr); return rjp::steal_as<rjp::value>(arr);
@ -148,7 +148,7 @@ rjp::value case_19(void){
//handle array with many element as object member //handle array with many element as object member
rjp::value case_21(void){ rjp::value case_21(void){
rjp::object obj; rjp::object obj;
rjp::array arr = obj.add<rjp::array>("arr"_ss); rjp::array arr = obj.add<rjp::array>("arr"_sv);
for(int i = 0;i < 10;++i) for(int i = 0;i < 10;++i)
arr.add<rjp::integer>(i); arr.add<rjp::integer>(i);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
@ -196,19 +196,19 @@ RJP_value* case_25(void){
} }
*/ */
rjp::value case_26(void){ rjp::value case_26(void){
return rjp::string_val("string"_ss); return rjp::string_val("string"_sv);
} }
rjp::value case_27(void){ rjp::value case_27(void){
return rjp::string_val(""_ss); return rjp::string_val(""_sv);
} }
rjp::value case_28(void){ rjp::value case_28(void){
rjp::object obj; rjp::object obj;
obj.add("key"_ss, "string"_ss); obj.add("key"_sv, "string"_sv);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }
rjp::value case_29(void){ rjp::value case_29(void){
rjp::object obj; rjp::object obj;
obj.add("key"_ss, ""_ss); obj.add("key"_sv, ""_sv);
return rjp::steal_as<rjp::value>(obj); return rjp::steal_as<rjp::value>(obj);
} }