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

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

Issue 9325047: Add token index position to classes and types for more accurate error reporting. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 10 months 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
OLDNEW
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 #include "platform/assert.h" 5 #include "platform/assert.h"
6 #include "vm/class_finalizer.h" 6 #include "vm/class_finalizer.h"
7 #include "vm/unit_test.h" 7 #include "vm/unit_test.h"
8 8
9 namespace dart { 9 namespace dart {
10 10
11 11
12 static RawClass* CreateTestClass(const char* name) { 12 static RawClass* CreateTestClass(const char* name) {
13 const Array& empty_array = Array::Handle(Array::Empty()); 13 const Array& empty_array = Array::Handle(Array::Empty());
14 const String& class_name = String::Handle(String::NewSymbol(name)); 14 const String& class_name = String::Handle(String::NewSymbol(name));
15 const Script& script = Script::Handle(); 15 const Script& script = Script::Handle();
16 const Class& cls = Class::Handle(Class::New(class_name, script)); 16 const intptr_t kPos = 1; // Dummy token index in non-existing source.
17 const Class& cls = Class::Handle(Class::New(class_name, script, kPos));
17 cls.set_interfaces(empty_array); 18 cls.set_interfaces(empty_array);
18 cls.SetFunctions(empty_array); 19 cls.SetFunctions(empty_array);
19 cls.SetFields(empty_array); 20 cls.SetFields(empty_array);
20 return cls.raw(); 21 return cls.raw();
21 } 22 }
22 23
23 24
24 TEST_CASE(ClassFinalizer) { 25 TEST_CASE(ClassFinalizer) {
25 GrowableArray<const Class*> classes_1; 26 GrowableArray<const Class*> classes_1;
26 classes_1.Add(&Class::ZoneHandle(CreateTestClass("BMW"))); 27 classes_1.Add(&Class::ZoneHandle(CreateTestClass("BMW")));
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 TEST_CASE(ClassFinalize_Resolve) { 66 TEST_CASE(ClassFinalize_Resolve) {
66 GrowableArray<const Class*> classes; 67 GrowableArray<const Class*> classes;
67 Class& rhb = Class::ZoneHandle(CreateTestClass("RhB")); 68 Class& rhb = Class::ZoneHandle(CreateTestClass("RhB"));
68 Class& sbb = Class::ZoneHandle(CreateTestClass("SBB")); 69 Class& sbb = Class::ZoneHandle(CreateTestClass("SBB"));
69 Library& lib = Library::Handle(NewLib("TestLib")); 70 Library& lib = Library::Handle(NewLib("TestLib"));
70 classes.Add(&rhb); 71 classes.Add(&rhb);
71 classes.Add(&sbb); 72 classes.Add(&sbb);
72 lib.AddClass(rhb); 73 lib.AddClass(rhb);
73 lib.AddClass(sbb); 74 lib.AddClass(sbb);
74 const String& superclass_name = String::Handle(sbb.Name()); 75 const String& superclass_name = String::Handle(sbb.Name());
76 const intptr_t kPos = 1; // Dummy token index in non-existing source.
75 const UnresolvedClass& unresolved = UnresolvedClass::Handle( 77 const UnresolvedClass& unresolved = UnresolvedClass::Handle(
76 UnresolvedClass::New(0, LibraryPrefix::Handle(), superclass_name)); 78 UnresolvedClass::New(LibraryPrefix::Handle(), superclass_name, kPos));
77 const TypeArguments& type_arguments = TypeArguments::Handle(); 79 const TypeArguments& type_arguments = TypeArguments::Handle();
78 rhb.set_super_type(Type::Handle(Type::New( 80 rhb.set_super_type(Type::Handle(Type::New(
79 Object::Handle(unresolved.raw()), type_arguments))); 81 Object::Handle(unresolved.raw()), type_arguments, kPos)));
80 ClassFinalizer::AddPendingClasses(classes); 82 ClassFinalizer::AddPendingClasses(classes);
81 EXPECT(ClassFinalizer::FinalizePendingClasses()); 83 EXPECT(ClassFinalizer::FinalizePendingClasses());
82 } 84 }
83 85
84 } // namespace dart 86 } // namespace dart
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698