AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Allow empty character literal ''

Browse Source 
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>
This commit is contained in:
Martin Smith 2012-10-10 15:15:21 +02:00 committed by The Qt Project
parent 264eeb68b2
commit 8473b6d05c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/qdoc/tokenizer.cpp
View 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();