nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix Serialization parser: spaces can be inserted before or after the arrays.

Browse source
This commit is contained in:
Benjamin BOUVIER 2012-10-01 23:25:51 -04:00
commit 3769021a23
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/src/serial/Parser.cpp
View file

@ -124,6 +124,7 @@ Entity* Parser::parseRight(const std::string & str, size_t & pos)
DEBUG("We read an object.") DEBUG("We read an object.")
Object* obj = new Object; Object* obj = new Object;
pos += 1; pos += 1;
ignoreChars( str, pos );
while( pos < str.size() && str[ pos ] != '}' ) while( pos < str.size() && str[ pos ] != '}' )
{ {
parseLeft( str, pos, obj ); parseLeft( str, pos, obj );
@ -145,11 +146,13 @@ Entity* Parser::parseRight(const std::string & str, size_t & pos)
DEBUG("We read an array") DEBUG("We read an array")
Array* array = new Array; Array* array = new Array;
pos += 1; pos += 1;
ignoreChars( str, pos );
while( pos < str.size() && str[ pos ] != ']' ) while( pos < str.size() && str[ pos ] != ']' )
{ {
Entity* child = parseRight( str, pos ); Entity* child = parseRight( str, pos );
if ( child ) if ( child )
array->push_back( child ); array->push_back( child );
ignoreChars( str, pos );
} }
DEBUG("We've finished to read our array.") DEBUG("We've finished to read our array.")
pos += 1; // we're on the ], go to the next char pos += 1; // we're on the ], go to the next char