update json error handling

This commit is contained in:
Daniel Larimer 2014-05-15 17:44:38 -04:00
parent 7078ebf382
commit 8c370b06e6

View file

@ -248,6 +248,10 @@ namespace fc
ss.put( in.get() ); ss.put( in.get() );
break; break;
default: default:
if( isalnum( c ) )
{
return ss.str() + stringFromToken( in );
}
done = true; done = true;
break; break;
} }
@ -270,12 +274,11 @@ namespace fc
{ {
std::stringstream ss; std::stringstream ss;
ss.exceptions( std::ifstream::badbit ); ss.exceptions( std::ifstream::badbit );
bool parsed_unexpected_character = false;
bool received_eof = false; bool received_eof = false;
try try
{ {
char c; char c;
while((c = in.peek()) && !parsed_unexpected_character) while((c = in.peek()) )
{ {
switch( c ) switch( c )
{ {
@ -291,8 +294,7 @@ namespace fc
ss.put( in.get() ); ss.put( in.get() );
break; break;
default: default:
parsed_unexpected_character = true; return ss.str() + stringFromToken(in);
break;
} }
} }
} }