diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-05-26 08:34:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-05-26 08:34:03 (GMT) |
| commit | aedd4d0cfb6965f51fb38689539b3417b6071601 (patch) | |
| tree | 5c80c85d0f8d26c45be1d5956d9c903aee95174c /src/declarative/qml/parser/javascriptparser.cpp | |
| parent | b29a83e5070410359ebed2d99b18f86bbe2d2939 (diff) | |
| parent | a06c0fe5a2c9eebf5e7cceb06f64e725b42715bd (diff) | |
| download | Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.zip Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.tar.gz Qt-aedd4d0cfb6965f51fb38689539b3417b6071601.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/javascriptparser.cpp')
| -rw-r--r-- | src/declarative/qml/parser/javascriptparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/parser/javascriptparser.cpp b/src/declarative/qml/parser/javascriptparser.cpp index 7ff438e..34ecd0e 100644 --- a/src/declarative/qml/parser/javascriptparser.cpp +++ b/src/declarative/qml/parser/javascriptparser.cpp @@ -430,7 +430,7 @@ case 51: { } break; case 52: { - 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; @@ -1675,7 +1675,7 @@ case 320: { 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]; @@ -1697,7 +1697,7 @@ case 320: { yytoken = tk; yylval = 0; yylloc = token_buffer[0].loc; - yylloc.length = 0; + yylloc.length = 0; action = errorState; goto _Lcheck_token; |