| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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 | 4 |
| 5 #ifndef VM_RAW_OBJECT_H_ | 5 #ifndef VM_RAW_OBJECT_H_ |
| 6 #define VM_RAW_OBJECT_H_ | 6 #define VM_RAW_OBJECT_H_ |
| 7 | 7 |
| 8 #include "platform/assert.h" | 8 #include "platform/assert.h" |
| 9 #include "vm/globals.h" | 9 #include "vm/globals.h" |
| 10 #include "vm/token.h" | 10 #include "vm/token.h" |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 } | 398 } |
| 399 intptr_t token_index_; | 399 intptr_t token_index_; |
| 400 int8_t type_state_; | 400 int8_t type_state_; |
| 401 }; | 401 }; |
| 402 | 402 |
| 403 | 403 |
| 404 class RawTypeParameter : public RawAbstractType { | 404 class RawTypeParameter : public RawAbstractType { |
| 405 private: | 405 private: |
| 406 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter); | 406 RAW_HEAP_OBJECT_IMPLEMENTATION(TypeParameter); |
| 407 | 407 |
| 408 RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->name_); } | 408 RawObject** from() { |
| 409 return reinterpret_cast<RawObject**>(&ptr()->parameterized_class_); |
| 410 } |
| 411 RawClass* parameterized_class_; |
| 409 RawString* name_; | 412 RawString* name_; |
| 410 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); } | 413 RawObject** to() { return reinterpret_cast<RawObject**>(&ptr()->name_); } |
| 411 intptr_t index_; | 414 intptr_t index_; |
| 412 intptr_t token_index_; | 415 intptr_t token_index_; |
| 413 int8_t type_state_; | 416 int8_t type_state_; |
| 414 }; | 417 }; |
| 415 | 418 |
| 416 | 419 |
| 417 class RawInstantiatedType : public RawAbstractType { | 420 class RawInstantiatedType : public RawAbstractType { |
| 418 private: | 421 private: |
| (...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1164 intptr_t type_; // Uninitialized, simple or complex. | 1167 intptr_t type_; // Uninitialized, simple or complex. |
| 1165 intptr_t flags_; // Represents global/local, case insensitive, multiline. | 1168 intptr_t flags_; // Represents global/local, case insensitive, multiline. |
| 1166 | 1169 |
| 1167 // Variable length data follows here. | 1170 // Variable length data follows here. |
| 1168 uint8_t data_[0]; | 1171 uint8_t data_[0]; |
| 1169 }; | 1172 }; |
| 1170 | 1173 |
| 1171 } // namespace dart | 1174 } // namespace dart |
| 1172 | 1175 |
| 1173 #endif // VM_RAW_OBJECT_H_ | 1176 #endif // VM_RAW_OBJECT_H_ |
| OLD | NEW |