Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement iterators for JsonArray: #35852

Merged
merged 6 commits into from
Dec 6, 2019
Merged

Implement iterators for JsonArray: #35852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3abaa2
Rename JsonArray::end member to avoid conflict later
BevapDin Dec 3, 2019
67d192d
Make some member functions of JsonArray const.
BevapDin Dec 3, 2019
04067b2
Use size_t instead of int as index value in JsonArray
BevapDin Dec 3, 2019
984a649
Implement iterators for JsonArray:
BevapDin Dec 3, 2019
30567ed
Fix test errors from unvisited JSON object members.
BevapDin Dec 6, 2019
b2d6077
Fix variable name collision in *some* compilers.
BevapDin Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions src/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ JsonArray::JsonArray( JsonIn &j )
positions.push_back( jsin->tell() );
jsin->skip_value();
}
end = jsin->tell();
end_ = jsin->tell();
final_separator = jsin->get_ate_separator();
}

Expand All @@ -421,7 +421,7 @@ JsonArray::JsonArray( const JsonArray &ja )
start = ja.start;
index = 0;
positions = ja.positions;
end = ja.end;
end_ = ja.end_;
final_separator = ja.final_separator;
}

Expand All @@ -431,7 +431,7 @@ JsonArray &JsonArray::operator=( const JsonArray &ja )
start = ja.start;
index = 0;
positions = ja.positions;
end = ja.end;
end_ = ja.end_;
final_separator = ja.final_separator;

return *this;
Expand All @@ -440,14 +440,14 @@ JsonArray &JsonArray::operator=( const JsonArray &ja )
void JsonArray::finish()
{
if( jsin && jsin->good() ) {
jsin->seek( end );
jsin->seek( end_ );
jsin->set_ate_separator( final_separator );
}
}

bool JsonArray::has_more()
bool JsonArray::has_more() const
{
return ( index >= 0 && size_t( index ) < positions.size() );
return index < positions.size();
}
size_t JsonArray::size() const
{
Expand All @@ -461,17 +461,17 @@ bool JsonArray::empty()
std::string JsonArray::str()
{
if( jsin ) {
return jsin->substr( start, end - start );
return jsin->substr( start, end_ - start );
} else {
return "[]";
}
}

void JsonArray::verify_index( int i )
void JsonArray::verify_index( const size_t i ) const
{
if( !jsin ) {
throw JsonError( "tried to access empty array." );
} else if( i < 0 || size_t( i ) >= positions.size() ) {
} else if( i >= positions.size() ) {
jsin->seek( start );
std::stringstream err;
err << "bad index value: " << i;
Expand Down Expand Up @@ -531,42 +531,42 @@ void JsonArray::skip_value()

/* static access */

bool JsonArray::get_bool( int i )
bool JsonArray::get_bool( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->get_bool();
}

int JsonArray::get_int( int i )
int JsonArray::get_int( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->get_int();
}

double JsonArray::get_float( int i )
double JsonArray::get_float( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->get_float();
}

std::string JsonArray::get_string( int i )
std::string JsonArray::get_string( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->get_string();
}

JsonArray JsonArray::get_array( int i )
JsonArray JsonArray::get_array( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->get_array();
}

JsonObject JsonArray::get_object( int i )
JsonObject JsonArray::get_object( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
Expand All @@ -575,7 +575,7 @@ JsonObject JsonArray::get_object( int i )

/* iterative type checking */

bool JsonArray::test_null()
bool JsonArray::test_null() const
{
if( !has_more() ) {
return false;
Expand All @@ -584,7 +584,7 @@ bool JsonArray::test_null()
return jsin->test_null();
}

bool JsonArray::test_bool()
bool JsonArray::test_bool() const
{
if( !has_more() ) {
return false;
Expand All @@ -593,7 +593,7 @@ bool JsonArray::test_bool()
return jsin->test_bool();
}

bool JsonArray::test_number()
bool JsonArray::test_number() const
{
if( !has_more() ) {
return false;
Expand All @@ -602,7 +602,7 @@ bool JsonArray::test_number()
return jsin->test_number();
}

bool JsonArray::test_string()
bool JsonArray::test_string() const
{
if( !has_more() ) {
return false;
Expand All @@ -611,7 +611,7 @@ bool JsonArray::test_string()
return jsin->test_string();
}

bool JsonArray::test_bitset()
bool JsonArray::test_bitset() const
{
if( !has_more() ) {
return false;
Expand All @@ -620,7 +620,7 @@ bool JsonArray::test_bitset()
return jsin->test_bitset();
}

bool JsonArray::test_array()
bool JsonArray::test_array() const
{
if( !has_more() ) {
return false;
Expand All @@ -629,7 +629,7 @@ bool JsonArray::test_array()
return jsin->test_array();
}

bool JsonArray::test_object()
bool JsonArray::test_object() const
{
if( !has_more() ) {
return false;
Expand All @@ -640,42 +640,42 @@ bool JsonArray::test_object()

/* random-access type checking */

bool JsonArray::has_null( int i )
bool JsonArray::has_null( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->test_null();
}

bool JsonArray::has_bool( int i )
bool JsonArray::has_bool( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->test_bool();
}

bool JsonArray::has_number( int i )
bool JsonArray::has_number( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->test_number();
}

bool JsonArray::has_string( int i )
bool JsonArray::has_string( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->test_string();
}

bool JsonArray::has_array( int i )
bool JsonArray::has_array( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
return jsin->test_array();
}

bool JsonArray::has_object( int i )
bool JsonArray::has_object( const size_t i ) const
{
verify_index( i );
jsin->seek( positions[i] );
Expand Down Expand Up @@ -1793,3 +1793,9 @@ std::ostream &operator<<( std::ostream &stream, const JsonError &err )
// instantiate them here, or move the templated read/write functions into the header.
template void JsonOut::write<12>( const std::bitset<12> & );
template bool JsonIn::read<12>( std::bitset<12> &, bool throw_on_error );

JsonIn &JsonArrayValueRef::seek() const
{
jsin_.seek( pos_ );
return jsin_;
}
Loading