summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Lexer.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-03-02 19:00:57 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2009-03-02 19:00:57 +0100
commitf96d8ff9e08532c8ba02713e5baef6ffb2b10cf6 (patch)
treea670360324d527347263016aef0ace0708951f0e /src/shared/cplusplus/Lexer.cpp
parented69c3990625f62f50fa2db185da211b47769553 (diff)
downloadqt-creator-f96d8ff9e08532c8ba02713e5baef6ffb2b10cf6.tar.gz
Fixed: Parsing of /**/ tokens.
Diffstat (limited to 'src/shared/cplusplus/Lexer.cpp')
-rw-r--r--src/shared/cplusplus/Lexer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp
index 4d3437caf4..ab3c35e67b 100644
--- a/src/shared/cplusplus/Lexer.cpp
+++ b/src/shared/cplusplus/Lexer.cpp
@@ -428,8 +428,13 @@ void Lexer::scan_helper(Token *tok)
bool doxy = false;
if (_yychar == '*' || _yychar == '!') {
+ const char ch = _yychar;
+
yyinp();
+ if (ch == '*' && _yychar == '/')
+ goto _Ldone;
+
if (! _yychar || std::isspace(_yychar))
doxy = true;
}
@@ -444,6 +449,7 @@ void Lexer::scan_helper(Token *tok)
}
}
+ _Ldone:
if (_yychar)
yyinp();
else