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

Update to new librexy

Browse Source
This commit is contained in:
rexy712 2022-05-21 09:58:26 -07:00
parent a3ea13fc03
commit 5c261ed7ed
6 changed files with 10 additions and 10 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::string_view<char> key(void)const{ rexy::string_view key(void)const{
return rexy::string_view<char>(member_key(this->m_value)->value, member_key(this->m_value)->length); return rexy::string_view(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::string_view<char> key(void)const{ rexy::string_view key(void)const{
return rexy::string_view<char>(member_key(m_value)->value, member_key(m_value)->length); return rexy::string_view(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::string_view<char> get(void)const; rexy::string_view 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::string_view<char>(void)const; operator rexy::string_view(void)const;
operator double(void)const; operator double(void)const;
}; };
} }

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

@ -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::string_view<char> string_val::get(void)const{ rexy::string_view 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::string_view<char>(str->value, str->length); return rexy::string_view(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::string_view<char>(void)const{ vget_proxy::operator rexy::string_view(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{

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

@ -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::string_view<char>(c), i % 2 == 0); subobj.add<rjp::boolean>(rexy::string_view(c), i % 2 == 0);
c[3] += 1; c[3] += 1;
} }
return rjp::steal_as<rjp::value>(arr); return rjp::steal_as<rjp::value>(arr);