[opengtl-commits] [625] BRACE isn't BRACKET (or the other way around)

[subversion@xxxxxxxxxxxxx]

Revision: 625
Author:   cyrille
Date:     2009-03-14 17:41:24 +0100 (Sat, 14 Mar 2009)

Log Message:
-----------
BRACE isn't BRACKET (or the other way around)

Modified Paths:
--------------
    trunk/OpenGTL/OpenShiva/OpenShiva/LightParser_p.cpp


Modified: trunk/OpenGTL/OpenShiva/OpenShiva/LightParser_p.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/LightParser_p.cpp	2009-03-14 16:40:51 UTC (rev 624)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/LightParser_p.cpp	2009-03-14 16:41:24 UTC (rev 625)
@@ -116,7 +116,7 @@
             if( isEvaluateParam and isOfType( currentToken(), GTLCore::Token::STARTBRACKET ) )
             {
               getNextToken();
-              while(currentToken().type != GTLCore::Token::ENDBRACE and currentToken().type != GTLCore::Token::END_OF_FILE )
+              while(currentToken().type != GTLCore::Token::ENDBRACKET and currentToken().type != GTLCore::Token::END_OF_FILE )
               {
                 // Next is either a type or a end bracket
                 bool output = false;
@@ -136,6 +136,7 @@
                 if( currentToken().type == GTLCore::Token::IDENTIFIER )
                 {
                   Source::ImageType image;
+//                   GTL_DEBUG( currentToken().string );
                   if( currentToken().string == "image" or currentToken().string == "pixel" )
                   {
                     image = Source::Image;
@@ -160,7 +161,7 @@
                   } else {
                     d->inputImageTypes.push_back(image);
                   }
-                  eatUntil( GTLCore::Token::ENDBRACE, GTLCore::Token::COMA );
+                  eatUntil( GTLCore::Token::ENDBRACKET, GTLCore::Token::COMA );
                   if(currentToken().type == GTLCore::Token::COMA )
                   {
                     getNextToken(); // eat the ','
@@ -189,6 +190,7 @@
 {
   while( currentToken().type != type1 and currentToken().type != type2 and currentToken().type != GTLCore::Token::END_OF_FILE )
   {
+//     GTL_DEBUG( currentToken().type << " " << GTLCore::Token::typeToString(currentToken().type));
     getNextToken();
   }
 }