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

QmlJS: Remove Interpreter namespace.

Browse Source 
The distinction between QmlJS and QmlJS::Interpreter has always been
weak and the extra namespace just added an unnecessary complication.

Change-Id: I4db8ef4bd91b5f6bf610a9d23fdbf55bd60250fc
Reviewed-on: http://codereview.qt.nokia.com/2743
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-08 12:47:49 +02:00
parent ff092f79b3
commit 0e54183d4d
42 changed files with 308 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,6 @@
#include <QtCore/QDebug>
using namespace QmlJS;
using namespace QmlJS::Interpreter;
Evaluate::Evaluate(const ScopeChain *scopeChain)
: _valueOwner(scopeChain->context()->valueOwner()),
@@ -53,12 +52,12 @@ Evaluate::~Evaluate()
{
}
const Interpreter::Value *Evaluate::operator()(AST::Node *ast)
const Value *Evaluate::operator()(AST::Node *ast)
{
return value(ast);
}
const Interpreter::Value *Evaluate::value(AST::Node *ast)
const Value *Evaluate::value(AST::Node *ast)
{
const Value *result = reference(ast);
@@ -71,7 +70,7 @@ const Interpreter::Value *Evaluate::value(AST::Node *ast)
return result;
}
const Interpreter::Value *Evaluate::reference(AST::Node *ast)
const Value *Evaluate::reference(AST::Node *ast)
{
// save the result
const Value *previousResult = switchResult(0);
@@ -83,16 +82,16 @@ const Interpreter::Value *Evaluate::reference(AST::Node *ast)
return switchResult(previousResult);
}
const Interpreter::Value *Evaluate::switchResult(const Interpreter::Value *result)
const Value *Evaluate::switchResult(const Value *result)
{
const Interpreter::Value *previousResult = _result;
const Value *previousResult = _result;
_result = result;
return previousResult;
}
const Interpreter::ObjectValue *Evaluate::switchScope(const Interpreter::ObjectValue *scope)
const ObjectValue *Evaluate::switchScope(const ObjectValue *scope)
{
const Interpreter::ObjectValue *previousScope = _scope;
const ObjectValue *previousScope = _scope;
_scope = scope;
return previousScope;
}
@@ -311,8 +310,8 @@ bool Evaluate::visit(AST::FieldMemberExpression *ast)
if (! ast->name)
return false;
if (const Interpreter::Value *base = _valueOwner->convertToObject(value(ast->base))) {
if (const Interpreter::ObjectValue *obj = base->asObjectValue()) {
if (const Value *base = _valueOwner->convertToObject(value(ast->base))) {
if (const ObjectValue *obj = base->asObjectValue()) {
_result = obj->lookupMember(ast->name->asString(), _context);
}
}
@@ -338,8 +337,8 @@ bool Evaluate::visit(AST::NewExpression *ast)
bool Evaluate::visit(AST::CallExpression *ast)
{
if (const Interpreter::Value *base = value(ast->base)) {
if (const Interpreter::FunctionValue *obj = base->asFunctionValue()) {
if (const Value *base = value(ast->base)) {
if (const FunctionValue *obj = base->asFunctionValue()) {
_result = obj->returnValue();
}
}