summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/javascript.g
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-04-30 08:33:31 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-04-30 08:33:31 (GMT)
commit0ce47e44c2c2259ebe2c8167766d91de082a3531 (patch)
tree0974b9d3a1cdc1c5390e5f5be491daa2e636dc23 /src/declarative/qml/parser/javascript.g
parent488d2f6012c13291d2a8fe7907c332e2ab1b1b15 (diff)
downloadQt-0ce47e44c2c2259ebe2c8167766d91de082a3531.zip
Qt-0ce47e44c2c2259ebe2c8167766d91de082a3531.tar.gz
Qt-0ce47e44c2c2259ebe2c8167766d91de082a3531.tar.bz2
Accept "return" and reserved words as property names
Diffstat (limited to 'src/declarative/qml/parser/javascript.g')
-rw-r--r--src/declarative/qml/parser/javascript.g14
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: {