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

Removed the token cache.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-07-01 17:10:14 +02:00
parent afdc4f6e3e
commit efcb01f071
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tools/cplusplus/generate-ast.cpp
View File

@@ -47,7 +47,6 @@
#include <Names.h>
#include <Scope.h>
#include <BackwardsScanner.h>
#include <TokenCache.h>
#include <utils/changeset.h>
@@ -849,14 +848,14 @@ static QString createConstructor(ClassSpecifierAST *classAST)
return result;
}
bool checkGenerated(TokenCache *tokenCache, const QTextCursor &cursor, int *doxyStart)
bool checkGenerated(const QTextCursor &cursor, int *doxyStart)
{
BackwardsScanner tokens(tokenCache, cursor);
SimpleToken prevToken = tokens.LA(1);
BackwardsScanner tokens(cursor);
Token prevToken = tokens.LA(1);
if (prevToken.kind() != T_DOXY_COMMENT && prevToken.kind() != T_CPP_DOXY_COMMENT)
return false;
*doxyStart = tokens.startPosition() + prevToken.position();
*doxyStart = tokens.startPosition() + prevToken.begin();
return tokens.text(tokens.startToken() - 1).contains(QLatin1String("\\generated"));
}
@@ -977,8 +976,6 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir)
QList<GenInfo> todo;
TokenCache tokenCache;
tokenCache.setDocument(&cpp_document);
TranslationUnitAST *xUnit = AST_cpp_document->translationUnit()->ast()->asTranslationUnit();
for (DeclarationListAST *iter = xUnit->declaration_list; iter; iter = iter->next) {
if (FunctionDefinitionAST *funDef = iter->value->asFunctionDefinition()) {
@@ -995,7 +992,7 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir)
const int start = cpp_document.findBlockByNumber(line - 1).position() + column - 1;
cursor.setPosition(start);
int doxyStart = start;
const bool isGenerated = checkGenerated(&tokenCache, cursor, &doxyStart);
const bool isGenerated = checkGenerated(cursor, &doxyStart);
AST_cpp_document->translationUnit()->getTokenEndPosition(funDef->lastToken() - 1, &line, &column);
int end = cpp_document.findBlockByNumber(line - 1).position() + column - 1;