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

CPlusPlus: Make (sub-)languague selection more generic

Browse Source 
Change-Id: I4e2df6992b446adec662ab07671acd41715e41fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
hjk
2013-10-06 02:41:22 +02:00
parent 0a600e041a
commit 2b532c73ee
23 changed files with 272 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,46 +40,12 @@ using namespace CPlusPlus;
SimpleLexer::SimpleLexer()
: _lastState(0),
_skipComments(false),
_qtMocRunEnabled(true),
_objCEnabled(false),
_endedJoined(false),
_cxx0xEnabled(false)
{
}
_endedJoined(false)
{}
SimpleLexer::~SimpleLexer()
{ }
bool SimpleLexer::qtMocRunEnabled() const
{
return _qtMocRunEnabled;
}
void SimpleLexer::setQtMocRunEnabled(bool enabled)
{
_qtMocRunEnabled = enabled;
}
bool SimpleLexer::objCEnabled() const
{
return _objCEnabled;
}
void SimpleLexer::setObjCEnabled(bool onoff)
{
_objCEnabled = onoff;
}
bool SimpleLexer::cxx0xEnabled() const
{
return _cxx0xEnabled;
}
void SimpleLexer::setCxx0xEnabled(bool enabled)
{
_cxx0xEnabled = enabled;
}
bool SimpleLexer::skipComments() const
{
return _skipComments;
@@ -104,11 +70,8 @@ QList<Token> SimpleLexer::operator()(const QString &text, int state)
const char *lastChar = firstChar + bytes.size();
Lexer lex(firstChar, lastChar);
lex.setQtMocRunEnabled(_qtMocRunEnabled);
lex.setObjCEnabled(_objCEnabled);
lex.setLanguageFeatures(_languageFeatures);
lex.setStartWithNewline(true);
lex.setObjCEnabled(_objCEnabled);
lex.setCxxOxEnabled(_cxx0xEnabled);
if (! _skipComments)
lex.setScanCommentTokens(true);
@@ -137,7 +100,7 @@ QList<Token> SimpleLexer::operator()(const QString &text, int state)
else if (inPreproc && tokens.size() == 1 && tk.is(T_IDENTIFIER) &&
spell == QLatin1String("include_next"))
lex.setScanAngleStringLiteralTokens(true);
else if (_objCEnabled
else if (_languageFeatures.objCEnabled
&& inPreproc && tokens.size() == 1 && tk.is(T_IDENTIFIER) &&
spell == QLatin1String("import"))
lex.setScanAngleStringLiteralTokens(true);
@@ -165,8 +128,13 @@ Token SimpleLexer::tokenAt(const QString &text,
int state,
bool qtMocRunEnabled)
{
// FIXME: Check default values.
LanguageFeatures features;
features.qtMocRunEnabled = qtMocRunEnabled;
features.qtEnabled = qtMocRunEnabled;
features.qtKeywordsEnabled = qtMocRunEnabled;
SimpleLexer tokenize;
tokenize.setQtMocRunEnabled(qtMocRunEnabled);
tokenize.setLanguageFeatures(features);
const QList<Token> tokens = tokenize(text, state);
const int tokenIdx = tokenAt(tokens, offset);
return (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);