| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 #if !defined(DART_PRECOMPILED_RUNTIME) | 4 #if !defined(DART_PRECOMPILED_RUNTIME) |
| 5 | 5 |
| 6 #include "platform/globals.h" | 6 #include "platform/globals.h" |
| 7 #include "vm/flags.h" | 7 #include "vm/flags.h" |
| 8 #include "vm/growable_array.h" | 8 #include "vm/growable_array.h" |
| 9 #include "vm/kernel.h" | 9 #include "vm/kernel.h" |
| 10 #include "vm/kernel_to_il.h" | 10 #include "vm/kernel_to_il.h" |
| (...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1145 StaticGet* get = new StaticGet(); | 1145 StaticGet* get = new StaticGet(); |
| 1146 get->position_ = reader->ReadPosition(); | 1146 get->position_ = reader->ReadPosition(); |
| 1147 get->target_ = Reference::ReadMemberFrom(reader); | 1147 get->target_ = Reference::ReadMemberFrom(reader); |
| 1148 return get; | 1148 return get; |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 | 1151 |
| 1152 StaticSet* StaticSet::ReadFrom(Reader* reader) { | 1152 StaticSet* StaticSet::ReadFrom(Reader* reader) { |
| 1153 TRACE_READ_OFFSET(); | 1153 TRACE_READ_OFFSET(); |
| 1154 StaticSet* set = new StaticSet(); | 1154 StaticSet* set = new StaticSet(); |
| 1155 set->position_ = reader->ReadPosition(); |
| 1155 set->target_ = Reference::ReadMemberFrom(reader); | 1156 set->target_ = Reference::ReadMemberFrom(reader); |
| 1156 set->expression_ = Expression::ReadFrom(reader); | 1157 set->expression_ = Expression::ReadFrom(reader); |
| 1157 return set; | 1158 return set; |
| 1158 } | 1159 } |
| 1159 | 1160 |
| 1160 | 1161 |
| 1161 Arguments* Arguments::ReadFrom(Reader* reader) { | 1162 Arguments* Arguments::ReadFrom(Reader* reader) { |
| 1162 TRACE_READ_OFFSET(); | 1163 TRACE_READ_OFFSET(); |
| 1163 Arguments* arguments = new Arguments(); | 1164 Arguments* arguments = new Arguments(); |
| 1164 arguments->types().ReadFromStatic<DartType>(reader); | 1165 arguments->types().ReadFromStatic<DartType>(reader); |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1265 expr->position_ = reader->ReadPosition(); | 1266 expr->position_ = reader->ReadPosition(); |
| 1266 expr->operand_ = Expression::ReadFrom(reader); | 1267 expr->operand_ = Expression::ReadFrom(reader); |
| 1267 expr->type_ = DartType::ReadFrom(reader); | 1268 expr->type_ = DartType::ReadFrom(reader); |
| 1268 return expr; | 1269 return expr; |
| 1269 } | 1270 } |
| 1270 | 1271 |
| 1271 | 1272 |
| 1272 AsExpression* AsExpression::ReadFrom(Reader* reader) { | 1273 AsExpression* AsExpression::ReadFrom(Reader* reader) { |
| 1273 TRACE_READ_OFFSET(); | 1274 TRACE_READ_OFFSET(); |
| 1274 AsExpression* expr = new AsExpression(); | 1275 AsExpression* expr = new AsExpression(); |
| 1276 expr->position_ = reader->ReadPosition(); |
| 1275 expr->operand_ = Expression::ReadFrom(reader); | 1277 expr->operand_ = Expression::ReadFrom(reader); |
| 1276 expr->type_ = DartType::ReadFrom(reader); | 1278 expr->type_ = DartType::ReadFrom(reader); |
| 1277 return expr; | 1279 return expr; |
| 1278 } | 1280 } |
| 1279 | 1281 |
| 1280 | 1282 |
| 1281 StringLiteral* StringLiteral::ReadFrom(Reader* reader) { | 1283 StringLiteral* StringLiteral::ReadFrom(Reader* reader) { |
| 1282 TRACE_READ_OFFSET(); | 1284 TRACE_READ_OFFSET(); |
| 1283 return new StringLiteral(Reference::ReadStringFrom(reader)); | 1285 return new StringLiteral(Reference::ReadStringFrom(reader)); |
| 1284 } | 1286 } |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1363 t->position_ = reader->ReadPosition(); | 1365 t->position_ = reader->ReadPosition(); |
| 1364 t->expression_ = Expression::ReadFrom(reader); | 1366 t->expression_ = Expression::ReadFrom(reader); |
| 1365 return t; | 1367 return t; |
| 1366 } | 1368 } |
| 1367 | 1369 |
| 1368 | 1370 |
| 1369 ListLiteral* ListLiteral::ReadFrom(Reader* reader, bool is_const) { | 1371 ListLiteral* ListLiteral::ReadFrom(Reader* reader, bool is_const) { |
| 1370 TRACE_READ_OFFSET(); | 1372 TRACE_READ_OFFSET(); |
| 1371 ListLiteral* literal = new ListLiteral(); | 1373 ListLiteral* literal = new ListLiteral(); |
| 1372 literal->is_const_ = is_const; | 1374 literal->is_const_ = is_const; |
| 1375 literal->position_ = reader->ReadPosition(); |
| 1373 literal->type_ = DartType::ReadFrom(reader); | 1376 literal->type_ = DartType::ReadFrom(reader); |
| 1374 literal->expressions_.ReadFromStatic<Expression>(reader); | 1377 literal->expressions_.ReadFromStatic<Expression>(reader); |
| 1375 return literal; | 1378 return literal; |
| 1376 } | 1379 } |
| 1377 | 1380 |
| 1378 | 1381 |
| 1379 MapLiteral* MapLiteral::ReadFrom(Reader* reader, bool is_const) { | 1382 MapLiteral* MapLiteral::ReadFrom(Reader* reader, bool is_const) { |
| 1380 TRACE_READ_OFFSET(); | 1383 TRACE_READ_OFFSET(); |
| 1381 MapLiteral* literal = new MapLiteral(); | 1384 MapLiteral* literal = new MapLiteral(); |
| 1382 literal->is_const_ = is_const; | 1385 literal->is_const_ = is_const; |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1528 reader->helper()->labels()->Push(stmt); | 1531 reader->helper()->labels()->Push(stmt); |
| 1529 stmt->body_ = Statement::ReadFrom(reader); | 1532 stmt->body_ = Statement::ReadFrom(reader); |
| 1530 reader->helper()->labels()->Pop(stmt); | 1533 reader->helper()->labels()->Pop(stmt); |
| 1531 return stmt; | 1534 return stmt; |
| 1532 } | 1535 } |
| 1533 | 1536 |
| 1534 | 1537 |
| 1535 BreakStatement* BreakStatement::ReadFrom(Reader* reader) { | 1538 BreakStatement* BreakStatement::ReadFrom(Reader* reader) { |
| 1536 TRACE_READ_OFFSET(); | 1539 TRACE_READ_OFFSET(); |
| 1537 BreakStatement* stmt = new BreakStatement(); | 1540 BreakStatement* stmt = new BreakStatement(); |
| 1541 stmt->position_ = reader->ReadPosition(); |
| 1538 stmt->target_ = reader->helper()->labels()->Lookup(reader->ReadUInt()); | 1542 stmt->target_ = reader->helper()->labels()->Lookup(reader->ReadUInt()); |
| 1539 return stmt; | 1543 return stmt; |
| 1540 } | 1544 } |
| 1541 | 1545 |
| 1542 | 1546 |
| 1543 WhileStatement* WhileStatement::ReadFrom(Reader* reader) { | 1547 WhileStatement* WhileStatement::ReadFrom(Reader* reader) { |
| 1544 TRACE_READ_OFFSET(); | 1548 TRACE_READ_OFFSET(); |
| 1545 WhileStatement* stmt = new WhileStatement(); | 1549 WhileStatement* stmt = new WhileStatement(); |
| 1546 stmt->condition_ = Expression::ReadFrom(reader); | 1550 stmt->condition_ = Expression::ReadFrom(reader); |
| 1547 stmt->body_ = Statement::ReadFrom(reader); | 1551 stmt->body_ = Statement::ReadFrom(reader); |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1708 return VariableDeclaration::ReadFromImpl(reader); | 1712 return VariableDeclaration::ReadFromImpl(reader); |
| 1709 } | 1713 } |
| 1710 | 1714 |
| 1711 | 1715 |
| 1712 VariableDeclaration* VariableDeclaration::ReadFromImpl(Reader* reader) { | 1716 VariableDeclaration* VariableDeclaration::ReadFromImpl(Reader* reader) { |
| 1713 TRACE_READ_OFFSET(); | 1717 TRACE_READ_OFFSET(); |
| 1714 PositionScope scope(reader); | 1718 PositionScope scope(reader); |
| 1715 | 1719 |
| 1716 VariableDeclaration* decl = new VariableDeclaration(); | 1720 VariableDeclaration* decl = new VariableDeclaration(); |
| 1717 decl->position_ = reader->ReadPosition(); | 1721 decl->position_ = reader->ReadPosition(); |
| 1722 decl->equals_position_ = reader->ReadPosition(); |
| 1718 decl->flags_ = reader->ReadFlags(); | 1723 decl->flags_ = reader->ReadFlags(); |
| 1719 decl->name_ = Reference::ReadStringFrom(reader); | 1724 decl->name_ = Reference::ReadStringFrom(reader); |
| 1720 decl->type_ = DartType::ReadFrom(reader); | 1725 decl->type_ = DartType::ReadFrom(reader); |
| 1721 decl->inferred_value_ = reader->ReadOptional<InferredValue>(); | 1726 decl->inferred_value_ = reader->ReadOptional<InferredValue>(); |
| 1722 decl->initializer_ = reader->ReadOptional<Expression>(); | 1727 decl->initializer_ = reader->ReadOptional<Expression>(); |
| 1723 | 1728 |
| 1724 // Go to next token position so it ends *after* the last potentially | 1729 // Go to next token position so it ends *after* the last potentially |
| 1725 // debuggable position in the initializer. | 1730 // debuggable position in the initializer. |
| 1726 TokenPosition position = reader->max_position(); | 1731 TokenPosition position = reader->max_position(); |
| 1727 if (position.IsReal()) position.Next(); | 1732 if (position.IsReal()) position.Next(); |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1927 | 1932 |
| 1928 kernel::Program* ReadPrecompiledKernelFromBuffer(const uint8_t* buffer, | 1933 kernel::Program* ReadPrecompiledKernelFromBuffer(const uint8_t* buffer, |
| 1929 intptr_t buffer_length) { | 1934 intptr_t buffer_length) { |
| 1930 kernel::Reader reader(buffer, buffer_length); | 1935 kernel::Reader reader(buffer, buffer_length); |
| 1931 return kernel::Program::ReadFrom(&reader); | 1936 return kernel::Program::ReadFrom(&reader); |
| 1932 } | 1937 } |
| 1933 | 1938 |
| 1934 | 1939 |
| 1935 } // namespace dart | 1940 } // namespace dart |
| 1936 #endif // !defined(DART_PRECOMPILED_RUNTIME) | 1941 #endif // !defined(DART_PRECOMPILED_RUNTIME) |
| OLD | NEW |