feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments and improved CPPEditor::isInComment to handle the newly introduced tokens.

Browse Source 
As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
This commit is contained in:
Roberto Raggi
2009-09-29 11:34:11 +02:00
parent 1ce92c0ed6
commit e40cd82f8c
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/cplusplus/Lexer.cpp
View File

@@ -428,7 +428,7 @@ void Lexer::scan_helper(Token *tok)
if (! f._scanCommentTokens)
goto _Lagain;
tok->f.kind = doxy ? T_DOXY_COMMENT : T_COMMENT;
tok->f.kind = doxy ? T_CPP_DOXY_COMMENT : T_CPP_COMMENT;
} else if (_yychar == '*') {
yyinp();

1
src/shared/cplusplus/Token.cpp
View File

@@ -54,6 +54,7 @@ CPLUSPLUS_BEGIN_NAMESPACE
static const char *token_names[] = {
(""), ("<error>"),
("<C++ comment>"), ("<C++ doxy comment>"),
("<comment>"), ("<doxy comment>"),
("<identifier>"), ("<numeric literal>"), ("<char literal>"),

5
src/shared/cplusplus/Token.h
View File

@@ -59,6 +59,8 @@ enum Kind {
T_EOF_SYMBOL = 0,
T_ERROR,
T_CPP_COMMENT,
T_CPP_DOXY_COMMENT,
T_COMMENT,
T_DOXY_COMMENT,
T_IDENTIFIER,
@@ -297,7 +299,8 @@ public:
{ return f.kind >= T_FIRST_KEYWORD && f.kind < T_FIRST_QT_KEYWORD; }
inline bool isComment() const
{ return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT; }
{ return f.kind == T_COMMENT || f.kind == T_DOXY_COMMENT ||
f.kind == T_CPP_COMMENT || f.kind == T_CPP_DOXY_COMMENT; }
inline bool isObjCAtKeyword() const
{ return f.kind >= T_FIRST_OBJC_AT_KEYWORD && f.kind <= T_LAST_OBJC_AT_KEYWORD; }