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

C++: Use getter functions of Token

Browse Source 
They are already inlined. Now it's easier to find read-only accesses.

Change-Id: I9aaeca3bc5860e3a20a536a2484925e4334c005f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-12-13 21:03:40 +01:00
parent a075bad97f
commit ba76baa65f
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/FindUsages.cpp
View File

@@ -140,7 +140,7 @@ void FindUsages::reportResult(unsigned tokenIndex, const QList<LookupItem> &cand
QString FindUsages::matchingLine(const Token &tk) const
{
const char *beg = _source.constData();
const char *cp = beg + tk.offset;
const char *cp = beg + tk.begin();
for (; cp != beg - 1; --cp) {
if (*cp == '\n')
break;
@@ -178,7 +178,7 @@ void FindUsages::reportResult(unsigned tokenIndex)
if (col)
--col; // adjust the column position.
const int len = tk.f.length;
const int len = tk.length();
const Usage u(_doc->fileName(), lineText, line, col, len);
_usages.append(u);

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

@@ -92,7 +92,7 @@ QList<Token> SimpleLexer::operator()(const QString &text, int state)
QStringRef spell = text.midRef(tk.begin(), tk.length());
lex.setScanAngleStringLiteralTokens(false);
if (tk.f.newline && tk.is(T_POUND))
if (tk.newline() && tk.is(T_POUND))
inPreproc = true;
else if (inPreproc && tokens.size() == 1 && tk.is(T_IDENTIFIER) &&
spell == QLatin1String("include"))

14
src/libs/cplusplus/pp-engine.cpp
View File

@@ -1026,7 +1026,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
//### TODO: error message
pushToken(tk);
// If a previous marker was found, make sure to put it back.
if (oldMarkerTk.f.length)
if (oldMarkerTk.length())
pushToken(&oldMarkerTk);
*tk = idTk;
return false;
@@ -1072,7 +1072,7 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
// This is not the most beautiful approach but it's quite reasonable. What we do here
// is to create a fake identifier token which is only composed by whitespaces. It's
// also not marked as expanded so it it can be treated as a regular token.
const QByteArray content(int(idTk.f.length + computeDistance(idTk)), ' ');
const QByteArray content(int(idTk.length() + computeDistance(idTk)), ' ');
PPToken fakeIdentifier = generateToken(T_IDENTIFIER,
content.constData(), content.length(),
idTk.lineno, false, false);
@@ -1085,8 +1085,8 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
// The first body token replaces the macro invocation so its whitespace and
// newline info is replicated.
PPToken &bodyTk = body[0];
bodyTk.f.whitespace = idTk.f.whitespace;
bodyTk.f.newline = idTk.f.newline;
bodyTk.f.whitespace = idTk.whitespace();
bodyTk.f.newline = idTk.newline();
// Expansions are tracked from a "top-level" basis. This means that each expansion
// section in the output corresponds to a direct use of a macro (either object-like
@@ -1105,13 +1105,13 @@ bool Preprocessor::handleIdentifier(PPToken *tk)
|| m_state.m_expansionStatus == JustFinishedExpansion) {
PPToken marker;
marker.f.expanded = true;
marker.f.length = idTk.f.length;
marker.f.length = idTk.length();
marker.offset = idTk.offset;
marker.lineno = idTk.lineno;
body.prepend(marker);
body.append(marker);
m_state.setExpansionStatus(ReadyForExpansion);
} else if (oldMarkerTk.f.length
} else if (oldMarkerTk.length()
&& (m_state.m_expansionStatus == ReadyForExpansion
|| m_state.m_expansionStatus == Expanding)) {
body.append(oldMarkerTk);
@@ -2023,7 +2023,7 @@ PPToken Preprocessor::generateConcatenated(const PPToken &leftTk, const PPToken
newText.append(leftTk.tokenStart(), leftTk.length());
newText.append(rightTk.tokenStart(), rightTk.length());
PPToken result = generateToken(T_IDENTIFIER, newText.constData(), newText.size(), leftTk.lineno, true);
result.f.whitespace = leftTk.f.whitespace;
result.f.whitespace = leftTk.whitespace();
return result;
}