diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index f131c9de98e7032683a9398d390d6d52d624acde..93b93ec73cd85ca3d3f7b063436c6ef0a9b6912d 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -55,6 +55,11 @@ bool SimpleToken::isComment() const return _kind == T_COMMENT || _kind == T_DOXY_COMMENT; } +bool SimpleToken::isObjCAtKeyword() const +{ + return _kind >= T_FIRST_LITERAL && _kind <= T_LAST_OBJC_AT_KEYWORD; +} + SimpleLexer::SimpleLexer() : _lastState(0), _skipComments(false), diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 669b4c00453a8708bb22c12b489074190c2c22eb..872a236fd8999b33b3bac368bf25a8979853a33e 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -79,6 +79,7 @@ public: bool isOperator() const; bool isKeyword() const; bool isComment() const; + bool isObjCAtKeyword() const; public: int _kind; diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index 2f016c4d37d6f6c26d535e0c0f4b9cd5362875ff..20be805d54619fea21c8040eef58c34a3c8ba48c 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -157,7 +157,7 @@ void CppHighlighter::highlightBlock(const QString &text) initialState = 0; } - } else if (tk.isKeyword() || isQtKeyword(tk.text())) + } else if (tk.isKeyword() || isQtKeyword(tk.text()) || tk.isObjCAtKeyword()) setFormat(tk.position(), tk.length(), m_formats[CppKeywordFormat]); else if (tk.isOperator()) diff --git a/src/shared/cplusplus/Lexer.cpp b/src/shared/cplusplus/Lexer.cpp index 2229b470bd225707b7c2d501a0f77479d531687b..5f727ef4afd360f38f5ec2061b3fe276f259496a 100644 --- a/src/shared/cplusplus/Lexer.cpp +++ b/src/shared/cplusplus/Lexer.cpp @@ -598,7 +598,7 @@ void Lexer::scan_helper(Token *tok) do { yyinp(); - if (! isalnum(_yychar)) + if (! (isalnum(_yychar) || _yychar == '_')) break; } while (_yychar); diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp index bda5ecc5839d243c21c5cfb86f5486c20b2c3231..828da8da318b65a0ddaa86c71d39de49122bf067 100644 --- a/src/shared/cplusplus/Token.cpp +++ b/src/shared/cplusplus/Token.cpp @@ -56,7 +56,7 @@ static const char *token_names[] = { ("<comment>"), ("<doxy comment>"), - ("<identifier>"), ("<int literal>"), ("<float literal>"), ("<char literal>"), + ("<identifier>"), ("<numeric literal>"), ("<char literal>"), ("<wide char literal>"), ("<string literal>"), ("<wide char literal>"), ("<@string literal>"), ("<angle string literal>"), diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h index 99b986c7abb49b1ecea7007e424efbce4b8b1c3a..6809468a1a6c39ede36d1ba366d5cb4e81b8ff28 100644 --- a/src/shared/cplusplus/Token.h +++ b/src/shared/cplusplus/Token.h @@ -224,9 +224,9 @@ enum Kind { T_AT_THROW, T_AT_TRY, - T_LAST_OBJC_AT_KEYWORD, + T_LAST_OBJC_AT_KEYWORD = T_AT_TRY, - T_FIRST_QT_KEYWORD = T_LAST_OBJC_AT_KEYWORD, + T_FIRST_QT_KEYWORD, // Qt keywords T_SIGNAL = T_FIRST_QT_KEYWORD, @@ -300,7 +300,7 @@ public: { return kind == T_COMMENT || kind == T_DOXY_COMMENT; } inline bool isObjCAtKeyword() const - { return kind >= T_FIRST_OBJC_AT_KEYWORD && kind < T_LAST_OBJC_AT_KEYWORD; } + { return kind >= T_FIRST_OBJC_AT_KEYWORD && kind <= T_LAST_OBJC_AT_KEYWORD; } static const char *name(int kind);