ignore bracketed expressions only outside function scope

static initializers obviously cannot appear in scopes, so there is no
reason to suppress parsing tr() statements used for indexing inside
functions.

Task-number: QTBUG-29998
Change-Id: I3a0330e1382cd5a74106328ae6722a02af282f7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index b6222e6..226075a 100644 (file)
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -1616,7 +1616,7 @@ void CppParser::parseInternal(ConversionData &cd, const QStringList &includeStac
         // so they don't confuse our scoping of static initializers.
         // we enter the loop by either reading a left bracket or by an
         // #else popping the state.
-        if (yyBracketDepth) {
+        if (yyBracketDepth && yyBraceDepth == namespaceDepths.count()) {
             yyTok = getToken();
             continue;
         }

diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
index 0db9a83..792d0dc 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
@@ -343,3 +343,12 @@ void YetMoreFun::funStuff()
 }
 
 }
+
+
+
+// QTBUG-29998: tr() macro inside square brackets
+void blubb()
+{
+    QMap<QString, QString> d;
+    d[LotsaFun::tr("bracketed")] = "plain";
+}

diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
index c8cca3f..c7367ca 100644 (file)
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
@@ -147,6 +147,11 @@ backslashed \ stuff.</source>
         <source>this is inside operator&lt;&lt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="main.cpp" line="353"/>
+        <source>bracketed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NameSchpace::YetMoreFun</name>