diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-26 01:46:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-26 01:46:00 (GMT) |
| commit | 478a339bc668611f6e31803e26c502a2aabe7bfe (patch) | |
| tree | c42e15048338377bf56db2ca5b26b8c20463767f /src/declarative/qml/parser/javascript.g | |
| parent | a106ba14b7ed630f5d7941462ba9271dd83acea3 (diff) | |
| parent | 7fc5d5e693a6a7f4c2bd040b8d6f29fd33a01712 (diff) | |
| download | Qt-478a339bc668611f6e31803e26c502a2aabe7bfe.zip Qt-478a339bc668611f6e31803e26c502a2aabe7bfe.tar.gz Qt-478a339bc668611f6e31803e26c502a2aabe7bfe.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/javascript.g b/src/declarative/qml/parser/javascript.g index 155630b..8cabeea 100644 --- a/src/declarative/qml/parser/javascript.g +++ b/src/declarative/qml/parser/javascript.g @@ -875,7 +875,7 @@ case $rule_number: { PrimaryExpression: T_NUMERIC_LITERAL ; /. case $rule_number: { - AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval); + AST::NumericLiteral *node = makeAstNode<AST::NumericLiteral> (driver->nodePool(), sym(1).dval, lexer->flags); node->literalToken = loc(1); sym(1).Node = node; } break; @@ -2830,7 +2830,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; yytoken = *tk; yylval = 0; yylloc = token_buffer[0].loc; - yylloc.length = 0; + yylloc.length = 0; first_token = &token_buffer[0]; last_token = &token_buffer[2]; @@ -2852,7 +2852,7 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ; yytoken = tk; yylval = 0; yylloc = token_buffer[0].loc; - yylloc.length = 0; + yylloc.length = 0; action = errorState; goto _Lcheck_token; |