[1587188]Fixed parsing of comment at tail of object.

orodbhen · Mar 23, 2007 · fe536c0 · fe536c0
1 parent 3ffbf20
commit fe536c0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -395,12 +395,17 @@ Reader::readObject( Token &tokenStart )
       Token comma;
       if ( !readToken( comma )
             ||  ( comma.type_ != tokenObjectEnd  &&  
-                  comma.type_ != tokenArraySeparator ) )
+                  comma.type_ != tokenArraySeparator &&
+		  comma.type_ != tokenComment ) )
       {
          return addErrorAndRecover( "Missing ',' or '}' in object declaration", 
                                     comma, 
                                     tokenObjectEnd );
       }
+      bool finalizeTokenOk = true;
+      while ( comma.type_ == tokenComment &&
+              finalizeTokenOk )
+         finalizeTokenOk = readToken( comma );
       if ( comma.type_ == tokenObjectEnd )
          return true;
    }