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

C++: Enabled C++0x in SimpleLexer

Browse Source 
We should create a UI flag for C++0x...

Change-Id: Iba30090aa580554af629c0fb59ae5fc22b306b80
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Leandro Melo
2011-11-18 11:15:35 +01:00
parent 9f73c5848b
commit 64d579dc3a
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/cplusplus/SimpleLexer.cpp
View File

@@ -72,6 +72,16 @@ void SimpleLexer::setObjCEnabled(bool onoff)
_objCEnabled = onoff; _objCEnabled = onoff;
} }
bool SimpleLexer::cxx0xEnabled() const
{
return _cxx0xEnabled;
}
void SimpleLexer::setCxx0xEnabled(bool enabled)
{
_cxx0xEnabled = enabled;
}
bool SimpleLexer::skipComments() const bool SimpleLexer::skipComments() const
{ {
return _skipComments; return _skipComments;
@@ -100,6 +110,7 @@ QList<Token> SimpleLexer::operator()(const QString &text, int state)
lex.setObjCEnabled(_objCEnabled); lex.setObjCEnabled(_objCEnabled);
lex.setStartWithNewline(true); lex.setStartWithNewline(true);
lex.setObjCEnabled(_objCEnabled); lex.setObjCEnabled(_objCEnabled);
lex.setCxxOxEnabled(_cxx0xEnabled);
if (! _skipComments) if (! _skipComments)
lex.setScanCommentTokens(true); lex.setScanCommentTokens(true);

4
src/libs/cplusplus/SimpleLexer.h
View File

@@ -57,6 +57,9 @@ public:
bool objCEnabled() const; bool objCEnabled() const;
void setObjCEnabled(bool onoff); void setObjCEnabled(bool onoff);
bool cxx0xEnabled() const;
void setCxx0xEnabled(bool enabled);
bool endedJoined() const; bool endedJoined() const;
QList<Token> operator()(const QString &text, int state = 0); QList<Token> operator()(const QString &text, int state = 0);
@@ -78,6 +81,7 @@ private:
bool _qtMocRunEnabled: 1; bool _qtMocRunEnabled: 1;
bool _objCEnabled: 1; bool _objCEnabled: 1;
bool _endedJoined: 1; bool _endedJoined: 1;
bool _cxx0xEnabled: 1;
}; };
} // namespace CPlusPlus } // namespace CPlusPlus

1
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -63,6 +63,7 @@ void CppHighlighter::highlightBlock(const QString &text)
SimpleLexer tokenize; SimpleLexer tokenize;
tokenize.setQtMocRunEnabled(false); tokenize.setQtMocRunEnabled(false);
tokenize.setObjCEnabled(false); tokenize.setObjCEnabled(false);
tokenize.setCxx0xEnabled(true);
int initialState = state; int initialState = state;
const QList<Token> tokens = tokenize(text, initialState); const QList<Token> tokens = tokenize(text, initialState);