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

QmlJS: Fix reference lookup cycles.

Browse Source 
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>
This commit is contained in:
Christian Kamm
2011-09-12 11:48:33 +02:00
parent ef47a40570
commit 7b2110de7e
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/qmljs/qmljsevaluate.cpp
View File

@@ -39,9 +39,10 @@
using namespace QmlJS;
Evaluate::Evaluate(const ScopeChain *scopeChain)
Evaluate::Evaluate(const ScopeChain *scopeChain, ReferenceContext *referenceContext)
: _valueOwner(scopeChain->context()->valueOwner()),
_context(scopeChain->context()),
_referenceContext(referenceContext),
_scopeChain(scopeChain),
_scope(_valueOwner->globalObject()),
_result(0)
@@ -61,8 +62,12 @@ const Value *Evaluate::value(AST::Node *ast)
{
const Value *result = reference(ast);
if (const Reference *ref = value_cast<const Reference *>(result))
result = _context->lookupReference(ref);
if (const Reference *ref = value_cast<const Reference *>(result)) {
if (_referenceContext)
result = _referenceContext->lookupReference(ref);
else
result = _context->lookupReference(ref);
}
if (! result)
result = _valueOwner->undefinedValue();