| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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 #include "vm/class_finalizer.h" | 5 #include "vm/class_finalizer.h" |
| 6 | 6 |
| 7 #include "vm/code_generator.h" | 7 #include "vm/code_generator.h" |
| 8 #include "vm/flags.h" | 8 #include "vm/flags.h" |
| 9 #include "vm/heap.h" | 9 #include "vm/heap.h" |
| 10 #include "vm/isolate.h" | 10 #include "vm/isolate.h" |
| (...skipping 1170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 ReportError(Error::Handle(), // No previous error. | 1181 ReportError(Error::Handle(), // No previous error. |
| 1182 script, field.token_pos(), | 1182 script, field.token_pos(), |
| 1183 "field '%s' of class '%s' conflicts with method '%s' " | 1183 "field '%s' of class '%s' conflicts with method '%s' " |
| 1184 "of super class '%s'", | 1184 "of super class '%s'", |
| 1185 name.ToCString(), | 1185 name.ToCString(), |
| 1186 class_name.ToCString(), | 1186 class_name.ToCString(), |
| 1187 name.ToCString(), | 1187 name.ToCString(), |
| 1188 super_class_name.ToCString()); | 1188 super_class_name.ToCString()); |
| 1189 } | 1189 } |
| 1190 } | 1190 } |
| 1191 if (field.is_static() && (field.is_const() || field.is_final()) && | 1191 if (field.is_static() && |
| 1192 (field.value() != Object::null()) && | 1192 (field.value() != Object::null()) && |
| 1193 (field.value() != Object::sentinel().raw())) { | 1193 (field.value() != Object::sentinel().raw())) { |
| 1194 // The parser does not preset the value if the type is a type parameter or | 1194 // The parser does not preset the value if the type is a type parameter or |
| 1195 // is parameterized unless the value is null. | 1195 // is parameterized unless the value is null. |
| 1196 Error& error = Error::Handle(); | 1196 Error& error = Error::Handle(); |
| 1197 if (type.IsMalformedOrMalbounded()) { | 1197 if (type.IsMalformedOrMalbounded()) { |
| 1198 error = type.error(); | 1198 error = type.error(); |
| 1199 } else { | 1199 } else { |
| 1200 ASSERT(type.IsInstantiated()); | 1200 ASSERT(type.IsInstantiated()); |
| 1201 } | 1201 } |
| (...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2931 expected_name ^= String::New("_offset"); | 2931 expected_name ^= String::New("_offset"); |
| 2932 ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name)); | 2932 ASSERT(String::EqualsIgnoringPrivateKey(name, expected_name)); |
| 2933 field ^= fields_array.At(2); | 2933 field ^= fields_array.At(2); |
| 2934 ASSERT(field.Offset() == TypedDataView::length_offset()); | 2934 ASSERT(field.Offset() == TypedDataView::length_offset()); |
| 2935 name ^= field.name(); | 2935 name ^= field.name(); |
| 2936 ASSERT(name.Equals("length")); | 2936 ASSERT(name.Equals("length")); |
| 2937 #endif | 2937 #endif |
| 2938 } | 2938 } |
| 2939 | 2939 |
| 2940 } // namespace dart | 2940 } // namespace dart |
| OLD | NEW |