소스 검색

fix openddl-issue wih token type containing line end.

Signed-off-by: Kim Kulling <[email protected]>
Kim Kulling 10 년 전
부모
커밋
d045dbdb69
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      contrib/openddlparser/code/OpenDDLParser.cpp

+ 3 - 3
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 );