diff options
| author | mae <qt-info@nokia.com> | 2009-04-20 13:53:01 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-04-24 07:52:36 (GMT) |
| commit | 73db0bebbf27f07faea3b8f71dccecd46cc4bbb7 (patch) | |
| tree | 3275484f460952759f7171056d1e41f6d7fa6f9d /src/declarative/qml/parser/javascript.g | |
| parent | 765166f9aca829391bc2f4ee60b6ea4b5f7ff683 (diff) | |
| download | Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.zip Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.tar.gz Qt-73db0bebbf27f07faea3b8f71dccecd46cc4bbb7.tar.bz2 | |
support public property definitions
Diffstat (limited to 'src/declarative/qml/parser/javascript.g')
| -rw-r--r-- | src/declarative/qml/parser/javascript.g | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index db6d898..c7b26e2 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -530,6 +530,16 @@ case $rule_number: { } break; ./ +UiObjectInitializer: T_LBRACE T_RBRACE ; +/. +case $rule_number: { + AST::UiObjectInitializer *node = makeAstNode<AST::UiObjectInitializer> (driver->nodePool(), (AST::UiObjectMemberList*)0); + node->lbraceToken = loc(1); + node->rbraceToken = loc(2); + sym(1).Node = node; +} break; +./ + UiObjectInitializer: T_LBRACE UiObjectMemberList T_RBRACE ; /. case $rule_number: { @@ -2223,7 +2233,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; token_buffer[1].loc = yylloc = location(lexer); if (t_action(errorState, yytoken)) { - const QString msg = QString::fromUtf8("Removed token: `%1'").arg(spell[token_buffer[0].token]); + const QString msg = QString::fromUtf8("Removed token: `%1'").arg(QLatin1String(spell[token_buffer[0].token])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -2253,7 +2263,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; for (int *tk = tokens; *tk != EOF_SYMBOL; ++tk) { int a = t_action(errorState, *tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[*tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[*tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); @@ -2273,7 +2283,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; for (int tk = 1; tk < TERMINAL_COUNT; ++tk) { int a = t_action(errorState, tk); if (a > 0 && t_action(a, yytoken)) { - const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(spell[tk]); + const QString msg = QString::fromUtf8("Inserted token: `%1'").arg(QLatin1String(spell[tk])); diagnostic_messages.append(DiagnosticMessage(DiagnosticMessage::Error, token_buffer[0].loc.startLine, token_buffer[0].loc.startColumn, msg)); |