summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2012-10-10 15:15:21 +0200
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-12 15:57:34 +0200
commit206f100a0d6761ebcfc4efdac19b860feecf3dbd (patch)
treedeb057424f82c57eedf385b27da7060b84262cfe
parent6234dadf09af4fc7f58b7707a436a08f8ab0318c (diff)
qdoc: Allow empty character literal ''
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: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rw-r--r--src/tools/qdoc/tokenizer.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/tools/qdoc/tokenizer.cpp b/src/tools/qdoc/tokenizer.cpp
index 69f2dafc39..29ce322cc9 100644
--- a/src/tools/qdoc/tokenizer.cpp
+++ b/src/tools/qdoc/tokenizer.cpp
@@ -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();