Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make objectFromStream always throw parse_error_exception when throwing

Browse source
This commit is contained in:
Vikram Rajkumar 2014-05-17 03:00:07 -04:00
parent cde67a202c
commit e8326ca66c
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/io/json.cpp
View file

@ -43,9 +43,8 @@ namespace fc
FC_THROW_EXCEPTION( parse_error_exception, "Expected '\\'" ); FC_THROW_EXCEPTION( parse_error_exception, "Expected '\\'" );
} }
template<typename T> template<typename T>
void skip_white_space( T& in ) void skip_white_space( T& in )
{ {
while( true ) while( true )
{ {
@ -176,8 +175,10 @@ namespace fc
return obj; return obj;
} }
FC_THROW_EXCEPTION( parse_error_exception, "Expected '}' after ${variant}", ("variant", obj ) ); FC_THROW_EXCEPTION( parse_error_exception, "Expected '}' after ${variant}", ("variant", obj ) );
}
catch( const fc::eof_exception& e )
{
FC_THROW_EXCEPTION( parse_error_exception, "Unexpected EOF: ${e}", ("e", e.to_detail_string() ) );
} FC_RETHROW_EXCEPTIONS( warn, "Error parsing object" ); } FC_RETHROW_EXCEPTIONS( warn, "Error parsing object" );
} }