Ticket #221: declarative.diff

declarative.pro

@@ -1 +1 @@
 TARGET     = QtDeclarative
+os2:TARGET_SHORT = QtDecl
 QPRO_PWD   = $$PWD
 QT         = core gui script network
 contains(QT_CONFIG, svg): QT += svg

qml/qdeclarativeparser_p.h

@@ -274 +274 @@
         union {
             bool b;
             double d;
+            qint64 l;
             QDeclarativeJS::AST::Node *n;
         };
         QString s;

qml/parser/qdeclarativejsparser_p.h

@@ -80 +80 @@
     union Value {
       int ival;
       double dval;
+      qint64 llval;
       NameId *sval;
       AST::ArgumentList *ArgumentList;
       AST::CaseBlock *CaseBlock;
@@ -216 +217 @@
 
     struct SavedToken {
        int token;
-       double dval;
+       qint64 lval;
        AST::SourceLocation loc;
     };
 
-    double yylval;
+    qint64 yylval;
     AST::SourceLocation yylloc;
     AST::SourceLocation yyprevlloc;
 

qml/parser/qdeclarativejsparser.cpp

@@ -168 +168 @@
 
             if (first_token == last_token) {
                 yytoken = lexer->lex();
-                yylval = lexer->dval();
+                yylval = lexer->llval();
                 yylloc = location(lexer);
             } else {
                 yytoken = first_token->token;
-                yylval = first_token->dval;
+                yylval = first_token->lval;
                 yylloc = first_token->loc;
                 ++first_token;
             }
@@ -182 +182 @@
         if (action > 0) {
             if (action != ACCEPT_STATE) {
                 yytoken = -1;
-                sym(1).dval = yylval;
+                sym(1).llval = yylval;
                 loc(1) = yylloc;
             } else {
               --tos;
@@ -1789 +1789 @@
         if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) {
             SavedToken &tk = token_buffer[0];
             tk.token = yytoken;
-            tk.dval = yylval;
+            tk.lval = yylval;
             tk.loc = yylloc;
 
             yylloc = yyprevlloc;
@@ -1814 +1814 @@
         hadErrors = true;
 
         token_buffer[0].token = yytoken;
-        token_buffer[0].dval = yylval;
+        token_buffer[0].lval = yylval;
         token_buffer[0].loc = yylloc;
 
         token_buffer[1].token = yytoken = lexer->lex();
-        token_buffer[1].dval  = yylval  = lexer->dval();
+        token_buffer[1].lval  = yylval  = lexer->llval();
         token_buffer[1].loc   = yylloc  = location(lexer);
 
         if (t_action(errorState, yytoken)) {

qml/parser/qdeclarativejslexer_p.h

@@ -195 +195 @@
     inline int ival() const { return qsyylval.ival; }
     inline double dval() const { return qsyylval.dval; }
     inline NameId *ustr() const { return qsyylval.ustr; }
+    inline qint64 llval() const { return qsyylval.llval; }
 
     const QChar *characterBuffer() const { return buffer16; }
     int characterCount() const { return pos16; }
@@ -219 +220 @@
     union {
         int ival;
         double dval;
+        qint64 llval;
         NameId *ustr;
     } qsyylval;
 

qml/qdeclarativeparser.cpp

@@ -259 +259 @@
 : t(Invalid) {}
 
 QDeclarativeParser::Variant::Variant(const Variant &o)
-: t(o.t), d(o.d), s(o.s)
+: t(o.t), l(o.l), s(o.s)
 {
 }
 
@@ -286 +286 @@
 QDeclarativeParser::Variant &QDeclarativeParser::Variant::operator=(const Variant &o)
 {
     t = o.t;
-    d = o.d;
+    l = o.l;
     s = o.s;
     return *this;
 }