diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-12 11:48:33 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-12 14:47:35 +0200 |
| commit | 7b2110de7ea69ffa3914d3289ac42cbb69d9a414 (patch) | |
| tree | b718a4b06791a1e28ce1ef48b80cc2c9cbd16c30 /src/libs/qmljs/qmljsinterpreter.cpp | |
| parent | ef47a405704783284565010af9371250d31e0856 (diff) | |
| download | qt-creator-7b2110de7ea69ffa3914d3289ac42cbb69d9a414.tar.gz | |
QmlJS: Fix reference lookup cycles.
Since several reference lookups involve Evaluate which may cause
further reference lookups, we need to be able to pass the existing
ReferenceContext to avoid cycles.
Change-Id: I2f1eeaad4d6b6ff094413d51077b03c985f6fab4
Reviewed-on: http://codereview.qt-project.org/4653
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsinterpreter.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsinterpreter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp index a8cfb6e974..f288c36ed2 100644 --- a/src/libs/qmljs/qmljsinterpreter.cpp +++ b/src/libs/qmljs/qmljsinterpreter.cpp @@ -727,7 +727,7 @@ void Reference::accept(ValueVisitor *visitor) const visitor->visit(this); } -const Value *Reference::value(const ReferenceContext *) const +const Value *Reference::value(ReferenceContext *) const { return _valueOwner->undefinedValue(); } @@ -1745,7 +1745,7 @@ ASTVariableReference::~ASTVariableReference() { } -const Value *ASTVariableReference::value(const ReferenceContext *referenceContext) const +const Value *ASTVariableReference::value(ReferenceContext *referenceContext) const { if (!_ast->expression) return valueOwner()->undefinedValue(); @@ -1755,7 +1755,7 @@ const Value *ASTVariableReference::value(const ReferenceContext *referenceContex ScopeBuilder builder(&scopeChain); builder.push(ScopeAstPath(doc)(_ast->expression->firstSourceLocation().begin())); - Evaluate evaluator(&scopeChain); + Evaluate evaluator(&scopeChain, referenceContext); return evaluator(_ast->expression); } @@ -1832,7 +1832,7 @@ UiQualifiedId *QmlPrototypeReference::qmlTypeName() const return _qmlTypeName; } -const Value *QmlPrototypeReference::value(const ReferenceContext *referenceContext) const +const Value *QmlPrototypeReference::value(ReferenceContext *referenceContext) const { return referenceContext->context()->lookupType(_doc, _qmlTypeName); } @@ -1859,7 +1859,7 @@ bool ASTPropertyReference::getSourceLocation(QString *fileName, int *line, int * return true; } -const Value *ASTPropertyReference::value(const ReferenceContext *referenceContext) const +const Value *ASTPropertyReference::value(ReferenceContext *referenceContext) const { if (_ast->statement && (!_ast->memberType || _ast->memberType->asString() == QLatin1String("variant") @@ -1875,7 +1875,7 @@ const Value *ASTPropertyReference::value(const ReferenceContext *referenceContex int offset = _ast->statement->firstSourceLocation().begin(); builder.push(ScopeAstPath(doc)(offset)); - Evaluate evaluator(&scopeChain); + Evaluate evaluator(&scopeChain, referenceContext); return evaluator(_ast->statement); } @@ -1906,7 +1906,7 @@ bool ASTSignalReference::getSourceLocation(QString *fileName, int *line, int *co return true; } -const Value *ASTSignalReference::value(const ReferenceContext *) const +const Value *ASTSignalReference::value(ReferenceContext *) const { return valueOwner()->undefinedValue(); } |