diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-29 14:33:40 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-29 14:47:43 (GMT) |
commit | 7258ad9817ae811808ea89c790b059474d145654 (patch) | |
tree | 8f6777026e5aa7b35942c14cee1322484229a9cd | |
parent | f08b60f4ca52d525c1dc9890cb0c6661ee34b069 (diff) | |
download | Qt-7258ad9817ae811808ea89c790b059474d145654.zip Qt-7258ad9817ae811808ea89c790b059474d145654.tar.gz Qt-7258ad9817ae811808ea89c790b059474d145654.tar.bz2 |
warn about stray meta data
-rw-r--r-- | tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt | 1 | ||||
-rw-r--r-- | tools/linguist/lupdate/cpp.cpp | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt index 959938c..d4ebe49 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp2/expectedoutput.txt @@ -4,3 +4,4 @@ .*/lupdate/testdata/good/parsecpp2/main.cpp:65: Excess closing brace .* .*/lupdate/testdata/good/parsecpp2/main.cpp:120: //% cannot be used with tr\(\) / QT_TR_NOOP\(\)\. Ignoring .*/lupdate/testdata/good/parsecpp2/main.cpp:123: //% cannot be used with translate\(\) / QT_TRANSLATE_NOOP\(\)\. Ignoring +.*/lupdate/testdata/good/parsecpp2/main.cpp:126: Discarding unconsumed meta data diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp index 25e162f..609bd3d 100644 --- a/tools/linguist/lupdate/cpp.cpp +++ b/tools/linguist/lupdate/cpp.cpp @@ -2081,10 +2081,13 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions) case Tok_Semicolon: prospectiveContext.clear(); prefix.clear(); - sourcetext.clear(); - extracomment.clear(); - msgid.clear(); - extra.clear(); + if (!sourcetext.isEmpty() || !extracomment.isEmpty() || !msgid.isEmpty() || !extra.isEmpty()) { + yyMsg() << "Discarding unconsumed meta data\n"; + sourcetext.clear(); + extracomment.clear(); + msgid.clear(); + extra.clear(); + } yyTokColonSeen = false; yyTok = getToken(); break; |