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

Removed FindScope in favour of the Document::scopeAt method.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-07-01 16:22:28 +02:00
parent 8e4fb678fd
commit afdc4f6e3e
1 changed files with 6 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -121,79 +121,14 @@ public:
} }
}; };
class FindScope: protected SymbolVisitor
{
TranslationUnit *_unit;
Scope *_scope;
unsigned _line;
unsigned _column;
public:
Scope *operator()(unsigned line, unsigned column,
Symbol *root, TranslationUnit *unit)
{
_unit = unit;
_scope = 0;
_line = line;
_column = column;
accept(root);
return _scope;
}
private:
using SymbolVisitor::visit;
virtual bool preVisit(Symbol *)
{ return ! _scope; }
virtual bool visit(Block *block)
{ return processScope(block->members()); }
virtual bool visit(Function *function)
{ return processScope(function->members()); }
virtual bool visit(ObjCMethod *method)
{ return processScope(method->members()); }
bool processScope(Scope *scope)
{
if (_scope || ! scope)
return false;
for (unsigned i = 0; i < scope->symbolCount(); ++i) {
accept(scope->symbolAt(i));
if (_scope)
return false;
}
unsigned startOffset = scope->owner()->startOffset();
unsigned endOffset = scope->owner()->endOffset();
unsigned startLine, startColumn;
unsigned endLine, endColumn;
_unit->getPosition(startOffset, &startLine, &startColumn);
_unit->getPosition(endOffset, &endLine, &endColumn);
if (_line > startLine || (_line == startLine && _column >= startColumn)) {
if (_line < endLine || (_line == endLine && _column < endColumn)) {
_scope = scope;
}
}
return false;
}
};
class FindLocalUses: protected ASTVisitor class FindLocalUses: protected ASTVisitor
{ {
Scope *_functionScope; Scope *_functionScope;
FindScope findScope; Document::Ptr _doc;
public: public:
FindLocalUses(TranslationUnit *translationUnit) FindLocalUses(Document::Ptr doc)
: ASTVisitor(translationUnit), hasD(false), hasQ(false) : ASTVisitor(doc->translationUnit()), _doc(doc), hasD(false), hasQ(false)
{ } { }
// local and external uses. // local and external uses.
@@ -269,9 +204,7 @@ protected:
unsigned line, column; unsigned line, column;
getTokenStartPosition(tokenIdx, &line, &column); getTokenStartPosition(tokenIdx, &line, &column);
Scope *scope = findScope(line, column, Scope *scope = _doc->scopeAt(line, column);
_functionScope->owner(),
translationUnit());
while (scope) { while (scope) {
if (scope->isFunctionScope()) { if (scope->isFunctionScope()) {
@@ -311,9 +244,7 @@ protected:
unsigned line, column; unsigned line, column;
getTokenStartPosition(ast->firstToken(), &line, &column); getTokenStartPosition(ast->firstToken(), &line, &column);
Scope *scope = findScope(line, column, Scope *scope = _doc->scopeAt(line, column);
_functionScope->owner(),
translationUnit());
while (scope) { while (scope) {
if (scope->isFunctionScope()) { if (scope->isFunctionScope()) {
@@ -2179,7 +2110,7 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
FunctionDefinitionUnderCursor functionDefinitionUnderCursor(translationUnit); FunctionDefinitionUnderCursor functionDefinitionUnderCursor(translationUnit);
DeclarationAST *currentFunctionDefinition = functionDefinitionUnderCursor(ast, source.line, source.column); DeclarationAST *currentFunctionDefinition = functionDefinitionUnderCursor(ast, source.line, source.column);
FindLocalUses useTable(translationUnit); FindLocalUses useTable(doc);
useTable(currentFunctionDefinition); useTable(currentFunctionDefinition);
SemanticInfo semanticInfo; SemanticInfo semanticInfo;