v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix openddl-issue wih token type containing line end. 

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/513/head
Kim Kulling 2015-03-20 21:55:19 +01:00
parent c78ed74e70
commit d045dbdb69
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/openddlparser/code/OpenDDLParser.cpp
View File

@ -290,8 +290,8 @@ char *OpenDDLParser::parseStructure( char *in, char *end ) {
bool error( false ); bool error( false );
in = getNextToken( in, end ); in = getNextToken( in, end );
if( *in == '{' ) { if( *in == '{' ) {
// loop over all children ( data and nodes )
do { do {
// loop over all childs ( data and nodes )
in = parseStructureBody( in, end, error ); in = parseStructureBody( in, end, error );
} while ( *in != '}' ); } while ( *in != '}' );
in++; in++;
@ -489,7 +489,7 @@ char *OpenDDLParser::parseIdentifier( char *in, char *end, Identifier **id ) {
// get size of id // get size of id
size_t idLen( 0 ); size_t idLen( 0 );
char *start( in ); char *start( in );
while( !isSeparator( *in ) && ( in != end ) && *in != '(' && *in != ')' ) { while( !isSeparator( *in ) && !isNewLine( *in ) && ( in != end ) && *in != '(' && *in != ')' ) {
in++; in++;
idLen++; idLen++;
} }
@ -855,7 +855,7 @@ char *OpenDDLParser::parseDataArrayList( char *in, char *end, DataArrayList **da
} }
in = getNextToken( in, end ); in = getNextToken( in, end );
if( *in == '{' ) { if( *in == Grammar::OpenBracketToken[ 0 ] ) {
in++; in++;
Value *current( ddl_nullptr ); Value *current( ddl_nullptr );
Reference *refs( ddl_nullptr ); Reference *refs( ddl_nullptr );