diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
| commit | 6470f646d0815f67bab507c1362cdda775c42a6e (patch) | |
| tree | 6389ca2728ec8b78294af60e20b918fdccdf88f1 /src/declarative/qml/parser/qmljs.g | |
| parent | 50f400ac20e918db1d0a6496003d953dedaba42a (diff) | |
| parent | 3bd0062535aaa991fadf739f9362851afacb19eb (diff) | |
| download | Qt-6470f646d0815f67bab507c1362cdda775c42a6e.zip Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.gz Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/parser/qmljs.g')
| -rw-r--r-- | src/declarative/qml/parser/qmljs.g | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/declarative/qml/parser/qmljs.g b/src/declarative/qml/parser/qmljs.g index 43cce40..20ee27d 100644 --- a/src/declarative/qml/parser/qmljs.g +++ b/src/declarative/qml/parser/qmljs.g @@ -750,26 +750,6 @@ case $rule_number: { } break; ./ -UiMultilineStringLiteral: T_MULTILINE_STRING_LITERAL ; -/. -case $rule_number: { - AST::StringLiteral *node = makeAstNode<AST::StringLiteral> (driver->nodePool(), sym(1).sval); - node->literalToken = loc(1); - sym(1).Node = node; -} break; -./ - -UiMultilineStringStatement: UiMultilineStringLiteral T_AUTOMATIC_SEMICOLON ; -- automatic semicolon -UiMultilineStringStatement: UiMultilineStringLiteral T_SEMICOLON ; -/. -case $rule_number: { - AST::ExpressionStatement *node = makeAstNode<AST::ExpressionStatement> (driver->nodePool(), sym(1).Expression); - node->semicolonToken = loc(2); - sym(1).Node = node; -} break; -./ - - UiObjectMember: UiQualifiedId T_COLON Expression UiObjectInitializer ; /. case $rule_number: { @@ -798,12 +778,6 @@ UiObjectMember: UiQualifiedId T_COLON EmptyStatement ; UiObjectMember: UiQualifiedId T_COLON ExpressionStatement ; /.case $rule_number:./ -UiObjectMember: UiQualifiedId T_COLON DebuggerStatement ; -/.case $rule_number:./ - -UiObjectMember: UiQualifiedId T_COLON UiMultilineStringStatement ; -/.case $rule_number:./ - UiObjectMember: UiQualifiedId T_COLON IfStatement ; --- ### do we really want if statement in a binding? /.case $rule_number:./ @@ -1053,6 +1027,9 @@ case $rule_number: { } break; ./ +PrimaryExpression: T_MULTILINE_STRING_LITERAL ; +/.case $rule_number:./ + PrimaryExpression: T_STRING_LITERAL ; /. case $rule_number: { |