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

Allow rjp++ assignment of values containing nullptr. Makes user interface flow nicer

Browse Source
This commit is contained in:
rexy712 2020-05-16 15:14:14 -07:00
parent 924558c8c9
commit ad2138ba5d
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ namespace rjp{
const_iterator begin(void)const;
iterator end(void)const;
value search(const rexy::string_base& key);
value search(const rexy::string_base& key)const;
private:
RJP_value* add_member_impl(const rexy::string_base& key);

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

@ -27,12 +27,16 @@ namespace rjp{
array::array(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_array)
rjp_set_array(m_value);
}
array::array(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_array)
rjp_set_array(m_value);
}

14
rjp++/src/integral.cpp
View File

@ -29,12 +29,16 @@ namespace rjp{
integer::integer(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_integer)
rjp_set_int(m_value, rjp_get_int(val.raw()));
}
integer::integer(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_integer)
rjp_set_int(m_value, rjp_get_int(m_value));
}
@ -62,12 +66,16 @@ namespace rjp{
dfloat::dfloat(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_dfloat)
rjp_set_float(m_value, rjp_get_float(val.raw()));
}
dfloat::dfloat(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_dfloat)
rjp_set_float(m_value, rjp_get_float(m_value));
}
@ -96,12 +104,16 @@ namespace rjp{
boolean::boolean(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_boolean)
rjp_set_bool(m_value, rjp_get_bool(val.raw()));
}
boolean::boolean(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_boolean)
rjp_set_bool(m_value, rjp_get_bool(m_value));
}
@ -128,6 +140,8 @@ namespace rjp{
null::null(const value& val):
value(val)
{
if(!m_value)
return;
rjp_set_null(m_value);
}
null::null(value&& val):

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

@ -26,12 +26,16 @@ namespace rjp{
object::object(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_object)
rjp_set_object(m_value);
}
object::object(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_object)
rjp_set_object(m_value);
}
@ -118,7 +122,7 @@ namespace rjp{
object::iterator object::end(void)const{
return iterator();
}
value object::search(const rexy::string_base& key){
value object::search(const rexy::string_base& key)const{
RJP_value* result = rjp_search_member(m_value, key.get());
return create_unmanaged(result);
}

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

@ -34,12 +34,16 @@ namespace rjp{
string_val::string_val(const value& val):
value(val)
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_string)
rjp_set_string(m_value, "", 0);
}
string_val::string_val(value&& val):
value(std::move(val))
{
if(!m_value)
return;
if(rjp_value_type(m_value) != rjp_json_string)
rjp_set_string(m_value, "", 0);
}