qdoc: Allow empty character literal ''
authorMartin Smith <martin.smith@digia.com>
Wed, 10 Oct 2012 13:15:21 +0000 (15:15 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sat, 13 Oct 2012 03:51:19 +0000 (05:51 +0200)
qdoc's tokenizer was reporting an error for the
empty character literal ''. Now it allows it.
Apparently it makes sense in .js files.

Task number: QTBUG-25775

Change-Id: If407427fad9b65a035c2c4785d53c9e3d5202e62
Reviewed-by: Martin Smith <martin.smith@digia.com>
src/tools/qdoc/tokenizer.cpp

index 69f2daf..29ce322 100644 (file)
@@ -244,6 +244,13 @@ int Tokenizer::getToken()
                 }
             case '\'':
                 yyCh = getChar();
+                /*
+                  Allow empty character literal. QTBUG-25775
+                 */
+                if (yyCh == '\'') {
+                    yyCh = getChar();
+                    break;
+                }
                 if (yyCh == '\\')
                     yyCh = getChar();
                 do {
@@ -251,8 +258,7 @@ int Tokenizer::getToken()
                 } while (yyCh != EOF && yyCh != '\'');
 
                 if (yyCh == EOF) {
-                    yyTokLoc.warning(tr("Unterminated C++ character"
-                                        " literal"));
+                    yyTokLoc.warning(tr("Unterminated C++ character literal"));
                 }
                 else {
                     yyCh = getChar();