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

Get rid of Environment, introduce external ScopeChain in Link.

Browse Source 
Done-with: Roberto
This commit is contained in:
Christian Kamm
2010-02-03 10:59:52 +01:00
parent ba18e70034
commit 49c43aaab1
8 changed files with 96 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -150,20 +150,6 @@ template <> Q_INLINE_TEMPLATE const Reference *value_cast(const Value *v)
else return 0;
}
////////////////////////////////////////////////////////////////////////////////
// Execution environment
////////////////////////////////////////////////////////////////////////////////
class QMLJS_EXPORT Environment
{
public:
Environment();
virtual ~Environment();
virtual const Environment *parent() const;
virtual const Value *lookup(const QString &name) const;
virtual const Value *lookupMember(const QString &name) const;
};
////////////////////////////////////////////////////////////////////////////////
// Value nodes
////////////////////////////////////////////////////////////////////////////////
@@ -250,7 +236,7 @@ public:
virtual void accept(ValueVisitor *) const;
};
class QMLJS_EXPORT ObjectValue: public Value, public Environment
class QMLJS_EXPORT ObjectValue: public Value
{
public:
ObjectValue(Engine *engine);
@@ -264,17 +250,12 @@ public:
const ObjectValue *prototype() const;
void setPrototype(const ObjectValue *prototype);
const ObjectValue *scope() const;
void setScope(const ObjectValue *scope);
virtual void processMembers(MemberProcessor *processor) const;
virtual const Value *property(const QString &name) const;
virtual void setProperty(const QString &name, const Value *value);
virtual void removeProperty(const QString &name);
// Environment interface
virtual const Environment *parent() const;
virtual const Value *lookupMember(const QString &name) const;
// Value interface
@@ -287,7 +268,6 @@ private:
private:
Engine *_engine;
const ObjectValue *_prototype;
const ObjectValue *_scope;
QHash<QString, const Value *> _members;
QString _className;
};