diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
| commit | 9442115ce46e87bb5a5939980cf900702dc4a87a (patch) | |
| tree | 26f02a55361bcde4f0b221037094ab095c5ce57b /src/declarative/qml/parser/javascript.g | |
| parent | e2f9eb037dfd26e02cad8a31a499a9c92a315d8b (diff) | |
| parent | 5b15e629641281dd87197b22bd4d0dc5dc7c89e1 (diff) | |
| download | Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.zip Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.tar.gz Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.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/javascript.g')
| -rw-r--r-- | src/declarative/qml/parser/javascript.g | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index f9a2165..cc72737 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -687,6 +687,20 @@ case $rule_number: { } break; ./ +UiQualifiedId: T_RESERVED_WORD ; +/. +case $rule_number: +./ +UiQualifiedId: T_RETURN ; +/. +case $rule_number: +{ + AST::UiQualifiedId *node = makeAstNode<AST::UiQualifiedId> (driver->nodePool(), driver->intern(lexer->characterBuffer(), lexer->characterCount())); + node->identifierToken = loc(1); + sym(1).Node = node; +} break; +./ + UiQualifiedId: T_IDENTIFIER ; /. case $rule_number: { |