diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-24 04:03:42 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-24 04:03:42 (GMT) |
| commit | 4e1a95923114a436e01f555dc90c57dc425ac79f (patch) | |
| tree | 20e965696dfb7bd69dc864b26673416cbf5931e9 /src/declarative/qml/parser | |
| parent | 8ba5e3b86984fce9fd3999d643cad6a732653940 (diff) | |
| download | Qt-4e1a95923114a436e01f555dc90c57dc425ac79f.zip Qt-4e1a95923114a436e01f555dc90c57dc425ac79f.tar.gz Qt-4e1a95923114a436e01f555dc90c57dc425ac79f.tar.bz2 | |
Revert "Fixed the semantic action of UiArrayMemberList"
This reverts commit ee91cc1041681654f7a250dc197d0902c53a951f.
Diffstat (limited to 'src/declarative/qml/parser')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 2 | ||||
| -rw-r--r-- | src/declarative/qml/parser/qmljsparser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 7d8faee..d7fb17c 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -782,7 +782,7 @@ UiArrayMemberList: UiArrayMemberList T_COMMA UiAnnotation UiObjectDefinition ; case $rule_number: { sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), - sym(1).UiArrayMemberList, sym(4).UiObjectMember); + sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; diff --git a/src/declarative/qml/parser/qmljsparser.cpp b/src/declarative/qml/parser/qmljsparser.cpp index 296559b..93f9fda 100644 --- a/src/declarative/qml/parser/qmljsparser.cpp +++ b/src/declarative/qml/parser/qmljsparser.cpp @@ -360,7 +360,7 @@ case 35: { case 36: { sym(4).UiObjectMember->attributes = sym(3).UiAttributeList; AST::UiArrayMemberList *node = makeAstNode<AST::UiArrayMemberList> (driver->nodePool(), - sym(1).UiArrayMemberList, sym(4).UiObjectMember); + sym(1).UiArrayMemberList, sym(3).UiObjectMember); node->commaToken = loc(2); sym(1).Node = node; } break; |