Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Side by Side Diff: runtime/vm/class_finalizer.cc

Issue 8933014: Rename type parameter to comply with upcoming corelib changes. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/lib/array.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, 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/flags.h" 7 #include "vm/flags.h"
8 #include "vm/heap.h" 8 #include "vm/heap.h"
9 #include "vm/isolate.h" 9 #include "vm/isolate.h"
10 #include "vm/longjump.h" 10 #include "vm/longjump.h"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 expected_type_extends = expected_extends_array.TypeAt(i); 414 expected_type_extends = expected_extends_array.TypeAt(i);
415 actual_type_extends = actual_extends_array.TypeAt(i); 415 actual_type_extends = actual_extends_array.TypeAt(i);
416 if (!expected_type_name.Equals(actual_type_name) || 416 if (!expected_type_name.Equals(actual_type_name) ||
417 !expected_type_extends.Equals(actual_type_extends)) { 417 !expected_type_extends.Equals(actual_type_extends)) {
418 mismatch = true; 418 mismatch = true;
419 } 419 }
420 } 420 }
421 if (mismatch) { 421 if (mismatch) {
422 const String& interface_name = String::Handle(interface.Name()); 422 const String& interface_name = String::Handle(interface.Name());
423 const String& factory_name = String::Handle(factory_class.Name()); 423 const String& factory_name = String::Handle(factory_class.Name());
424 // TODO(regis): Report the filename and position as well.
425 const Script& script = Script::Handle(interface.script()); 424 const Script& script = Script::Handle(interface.script());
426 ReportError(script, unresolved_factory_class.token_index(), 425 ReportError(script, unresolved_factory_class.token_index(),
427 "mismatch in number or names of type parameters between " 426 "mismatch in number, names, or bounds of type parameters "
428 "factory clause of interface '%s' and actual factory " 427 "between default clause of interface '%s' and actual factory "
429 "class '%s'.\n", 428 "class '%s'.\n",
430 interface_name.ToCString(), 429 interface_name.ToCString(),
431 factory_name.ToCString()); 430 factory_name.ToCString());
432 } 431 }
433 } 432 }
434 433
435 434
436 void ClassFinalizer::ResolveType(const Class& cls, const AbstractType& type) { 435 void ClassFinalizer::ResolveType(const Class& cls, const AbstractType& type) {
437 if (type.IsResolved()) { 436 if (type.IsResolved()) {
438 return; 437 return;
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1304 va_end(args); 1303 va_end(args);
1305 if (FLAG_warning_as_error) { 1304 if (FLAG_warning_as_error) {
1306 Isolate::Current()->long_jump_base()->Jump(1, message_buffer); 1305 Isolate::Current()->long_jump_base()->Jump(1, message_buffer);
1307 UNREACHABLE(); 1306 UNREACHABLE();
1308 } else { 1307 } else {
1309 OS::Print(message_buffer); 1308 OS::Print(message_buffer);
1310 } 1309 }
1311 } 1310 }
1312 1311
1313 } // namespace dart 1312 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/lib/array.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698