Ticket #221: declarative.diff
File declarative.diff, 4.4 KB (added by , 13 years ago) |
---|
-
declarative.pro
1 1 TARGET = QtDeclarative 2 os2:TARGET_SHORT = QtDecl 2 3 QPRO_PWD = $$PWD 3 4 QT = core gui script network 4 5 contains(QT_CONFIG, svg): QT += svg -
qml/qdeclarativeparser_p.h
274 274 union { 275 275 bool b; 276 276 double d; 277 qint64 l; 277 278 QDeclarativeJS::AST::Node *n; 278 279 }; 279 280 QString s; -
qml/parser/qdeclarativejsparser_p.h
80 80 union Value { 81 81 int ival; 82 82 double dval; 83 qint64 llval; 83 84 NameId *sval; 84 85 AST::ArgumentList *ArgumentList; 85 86 AST::CaseBlock *CaseBlock; … … 216 217 217 218 struct SavedToken { 218 219 int token; 219 double dval;220 qint64 lval; 220 221 AST::SourceLocation loc; 221 222 }; 222 223 223 doubleyylval;224 qint64 yylval; 224 225 AST::SourceLocation yylloc; 225 226 AST::SourceLocation yyprevlloc; 226 227 -
qml/parser/qdeclarativejsparser.cpp
168 168 169 169 if (first_token == last_token) { 170 170 yytoken = lexer->lex(); 171 yylval = lexer-> dval();171 yylval = lexer->llval(); 172 172 yylloc = location(lexer); 173 173 } else { 174 174 yytoken = first_token->token; 175 yylval = first_token-> dval;175 yylval = first_token->lval; 176 176 yylloc = first_token->loc; 177 177 ++first_token; 178 178 } … … 182 182 if (action > 0) { 183 183 if (action != ACCEPT_STATE) { 184 184 yytoken = -1; 185 sym(1). dval = yylval;185 sym(1).llval = yylval; 186 186 loc(1) = yylloc; 187 187 } else { 188 188 --tos; … … 1789 1789 if (yytoken != -1 && t_action(errorState, T_AUTOMATIC_SEMICOLON) && automatic(driver, yytoken)) { 1790 1790 SavedToken &tk = token_buffer[0]; 1791 1791 tk.token = yytoken; 1792 tk. dval = yylval;1792 tk.lval = yylval; 1793 1793 tk.loc = yylloc; 1794 1794 1795 1795 yylloc = yyprevlloc; … … 1814 1814 hadErrors = true; 1815 1815 1816 1816 token_buffer[0].token = yytoken; 1817 token_buffer[0]. dval = yylval;1817 token_buffer[0].lval = yylval; 1818 1818 token_buffer[0].loc = yylloc; 1819 1819 1820 1820 token_buffer[1].token = yytoken = lexer->lex(); 1821 token_buffer[1]. dval = yylval = lexer->dval();1821 token_buffer[1].lval = yylval = lexer->llval(); 1822 1822 token_buffer[1].loc = yylloc = location(lexer); 1823 1823 1824 1824 if (t_action(errorState, yytoken)) { -
qml/parser/qdeclarativejslexer_p.h
195 195 inline int ival() const { return qsyylval.ival; } 196 196 inline double dval() const { return qsyylval.dval; } 197 197 inline NameId *ustr() const { return qsyylval.ustr; } 198 inline qint64 llval() const { return qsyylval.llval; } 198 199 199 200 const QChar *characterBuffer() const { return buffer16; } 200 201 int characterCount() const { return pos16; } … … 219 220 union { 220 221 int ival; 221 222 double dval; 223 qint64 llval; 222 224 NameId *ustr; 223 225 } qsyylval; 224 226 -
qml/qdeclarativeparser.cpp
259 259 : t(Invalid) {} 260 260 261 261 QDeclarativeParser::Variant::Variant(const Variant &o) 262 : t(o.t), d(o.d), s(o.s)262 : t(o.t), l(o.l), s(o.s) 263 263 { 264 264 } 265 265 … … 286 286 QDeclarativeParser::Variant &QDeclarativeParser::Variant::operator=(const Variant &o) 287 287 { 288 288 t = o.t; 289 d = o.d;289 l = o.l; 290 290 s = o.s; 291 291 return *this; 292 292 }