QmlJS: Resolve references while evaluating expressions.

Task-number: QTCREATORBUG-5752
Change-Id: Ibcdaac039a5e862d7a8f03f58c8bf017b544e436
Reviewed-on: http://codereview.qt.nokia.com/2736
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

1 files changed, 9 insertions, 4 deletions

diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 955ef7dc56..410d3d3a38 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -53,6 +53,11 @@ Evaluate::~Evaluate()
 
 const Interpreter::Value *Evaluate::operator()(AST::Node *ast)
 {
+    return value(ast);
+}
+
+const Interpreter::Value *Evaluate::value(AST::Node *ast)
+{
     const Value *result = reference(ast);
 
     if (const Reference *ref = value_cast<const Reference *>(result))
@@ -304,7 +309,7 @@ bool Evaluate::visit(AST::FieldMemberExpression *ast)
     if (! ast->name)
         return false;
 
-    if (const Interpreter::Value *base = _valueOwner->convertToObject(reference(ast->base))) {
+    if (const Interpreter::Value *base = _valueOwner->convertToObject(value(ast->base))) {
         if (const Interpreter::ObjectValue *obj = base->asObjectValue()) {
             _result = obj->lookupMember(ast->name->asString(), _context);
         }
@@ -315,7 +320,7 @@ bool Evaluate::visit(AST::FieldMemberExpression *ast)
 
 bool Evaluate::visit(AST::NewMemberExpression *ast)
 {
-    if (const FunctionValue *ctor = value_cast<const FunctionValue *>(reference(ast->base))) {
+    if (const FunctionValue *ctor = value_cast<const FunctionValue *>(value(ast->base))) {
         _result = ctor->construct();
     }
     return false;
@@ -323,7 +328,7 @@ bool Evaluate::visit(AST::NewMemberExpression *ast)
 
 bool Evaluate::visit(AST::NewExpression *ast)
 {
-    if (const FunctionValue *ctor = value_cast<const FunctionValue *>(reference(ast->expression))) {
+    if (const FunctionValue *ctor = value_cast<const FunctionValue *>(value(ast->expression))) {
         _result = ctor->construct();
     }
     return false;
@@ -331,7 +336,7 @@ bool Evaluate::visit(AST::NewExpression *ast)
 
 bool Evaluate::visit(AST::CallExpression *ast)
 {
-    if (const Interpreter::Value *base = reference(ast->base)) {
+    if (const Interpreter::Value *base = value(ast->base)) {
         if (const Interpreter::FunctionValue *obj = base->asFunctionValue()) {
             _result = obj->returnValue();
         }