From d045dbdb69b4edfa5faca4a10164b972a96307cf Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 20 Mar 2015 21:55:19 +0100 Subject: [PATCH] fix openddl-issue wih token type containing line end. Signed-off-by: Kim Kulling --- contrib/openddlparser/code/OpenDDLParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/openddlparser/code/OpenDDLParser.cpp b/contrib/openddlparser/code/OpenDDLParser.cpp index 186323730..5ff314aa5 100644 --- a/contrib/openddlparser/code/OpenDDLParser.cpp +++ b/contrib/openddlparser/code/OpenDDLParser.cpp @@ -290,8 +290,8 @@ char *OpenDDLParser::parseStructure( char *in, char *end ) { bool error( false ); in = getNextToken( in, end ); if( *in == '{' ) { + // loop over all children ( data and nodes ) do { - // loop over all childs ( data and nodes ) in = parseStructureBody( in, end, error ); } while ( *in != '}' ); in++; @@ -489,7 +489,7 @@ char *OpenDDLParser::parseIdentifier( char *in, char *end, Identifier **id ) { // get size of id size_t idLen( 0 ); char *start( in ); - while( !isSeparator( *in ) && ( in != end ) && *in != '(' && *in != ')' ) { + while( !isSeparator( *in ) && !isNewLine( *in ) && ( in != end ) && *in != '(' && *in != ')' ) { in++; idLen++; } @@ -855,7 +855,7 @@ char *OpenDDLParser::parseDataArrayList( char *in, char *end, DataArrayList **da } in = getNextToken( in, end ); - if( *in == '{' ) { + if( *in == Grammar::OpenBracketToken[ 0 ] ) { in++; Value *current( ddl_nullptr ); Reference *refs( ddl_nullptr );