summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/javascriptast_p.h
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-05-18 09:11:48 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-05-18 09:11:48 (GMT)
commitdc2cc1e853a3dd98646a4619903ad2086d0fe62d (patch)
tree7bc3ae31ba2251b7e63c6cfc613e73f91eb54fb7 /src/declarative/qml/parser/javascriptast_p.h
parent6210f1508da2d62614e0e9d35e5036a3ab9ee247 (diff)
downloadQt-dc2cc1e853a3dd98646a4619903ad2086d0fe62d.zip
Qt-dc2cc1e853a3dd98646a4619903ad2086d0fe62d.tar.gz
Qt-dc2cc1e853a3dd98646a4619903ad2086d0fe62d.tar.bz2
Introduced qualified type names in the grammar.
Diffstat (limited to 'src/declarative/qml/parser/javascriptast_p.h')
-rw-r--r--src/declarative/qml/parser/javascriptast_p.h23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index 571fdff..e446e89 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2345,28 +2345,22 @@ class UiObjectDefinition: public UiObjectMember
public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectDefinition)
- UiObjectDefinition(NameId *name,
+ UiObjectDefinition(UiQualifiedId *qualifiedObjectNameId,
UiObjectInitializer *initializer)
- : name(name), initializer(initializer)
+ : qualifiedObjectNameId(qualifiedObjectNameId), initializer(initializer)
{ kind = K; }
virtual SourceLocation firstSourceLocation() const
- { return identifierToken; }
+ { return qualifiedObjectNameId->identifierToken; }
virtual SourceLocation lastSourceLocation() const
- {
- if (initializer)
- return initializer->rbraceToken;
-
- return identifierToken;
- }
+ { return initializer->rbraceToken; }
virtual void accept0(Visitor *visitor);
// attributes
- NameId *name;
+ UiQualifiedId *qualifiedObjectNameId;
UiObjectInitializer *initializer;
- SourceLocation identifierToken;
};
class UiSourceElement: public UiObjectMember
@@ -2411,10 +2405,10 @@ public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectBinding)
UiObjectBinding(UiQualifiedId *qualifiedId,
- NameId *name,
+ UiQualifiedId *qualifiedObjectNameId,
UiObjectInitializer *initializer)
: qualifiedId(qualifiedId),
- name(name),
+ qualifiedObjectNameId(qualifiedObjectNameId),
initializer(initializer)
{ kind = K; }
@@ -2428,10 +2422,9 @@ public:
// attributes
UiQualifiedId *qualifiedId;
- NameId *name;
+ UiQualifiedId *qualifiedObjectNameId;
UiObjectInitializer *initializer;
SourceLocation colonToken;
- SourceLocation identifierToken;
};
class UiScriptBinding: public UiObjectMember