summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-10 10:28:10 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-10 10:54:58 (GMT)
commit941a03814a5f8f7be93425f71ee65a4222d16899 (patch)
treed3faf690e18d72a7f08dc00938fc0cac28c2f95f
parent5c7042862c74dd3a5666bb266eaed922407e9711 (diff)
downloadQt-941a03814a5f8f7be93425f71ee65a4222d16899.zip
Qt-941a03814a5f8f7be93425f71ee65a4222d16899.tar.gz
Qt-941a03814a5f8f7be93425f71ee65a4222d16899.tar.bz2
don't let comments weaved into strings confuse us
Reviewed-by: TrustMe Task-number: 254260 Testcase: 323072@p4
-rw-r--r--tools/linguist/shared/cpp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/linguist/shared/cpp.cpp b/tools/linguist/shared/cpp.cpp
index 0aab661..541543f 100644
--- a/tools/linguist/shared/cpp.cpp
+++ b/tools/linguist/shared/cpp.cpp
@@ -480,7 +480,9 @@ static bool matchString(QString *s)
s->clear();
while (yyTok == Tok_String) {
*s += yyString;
- yyTok = getToken();
+ do {
+ yyTok = getToken();
+ } while (yyTok == Tok_Comment);
}
return matches;
}