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

Fix prototype reference resolution for Qml objects.

Browse Source
This commit is contained in:
Christian Kamm
2010-02-04 09:44:43 +01:00
parent ccc50ac100
commit e984691fe6
5 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
namespace QmlJS {
class NameId;
class Document;
namespace Interpreter {
@@ -229,14 +230,14 @@ public:
LookupMode lookupMode() const;
void setLookupMode(LookupMode lookupMode);
const ObjectValue *typeEnvironment() const;
void setTypeEnvironment(const ObjectValue *typeEnvironment);
const ObjectValue *typeEnvironment(const Document *doc) const;
void setTypeEnvironment(const Document *doc, const ObjectValue *typeEnvironment);
void pushScope(const ObjectValue *object);
void popScope();
const Value *lookup(const QString &name);
const ObjectValue *lookupType(AST::UiQualifiedId *qmlTypeName);
const ObjectValue *lookupType(const Document *doc, AST::UiQualifiedId *qmlTypeName);
const Value *property(const ObjectValue *object, const QString &name) const;
void setProperty(const ObjectValue *object, const QString &name, const Value *value);
@@ -246,9 +247,9 @@ private:
Engine *_engine;
LookupMode _lookupMode;
const ObjectValue *_typeEnvironment;
QHash<const ObjectValue *, Properties> _properties;
ScopeChain _scopeChain;
QHash<const Document *, const ObjectValue *> _typeEnvironments;
};
class QMLJS_EXPORT Reference: public Value
@@ -626,7 +627,7 @@ private:
class QMLJS_EXPORT QmlPrototypeReference: public Reference
{
public:
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, Engine *engine);
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, Engine *engine);
virtual ~QmlPrototypeReference();
AST::UiQualifiedId *qmlTypeName() const;
@@ -635,6 +636,7 @@ public:
private:
AST::UiQualifiedId *_qmlTypeName;
const Document *_doc;
};
class QMLJS_EXPORT ASTObjectValue: public ObjectValue