| Index: runtime/vm/object_test.cc
|
| ===================================================================
|
| --- runtime/vm/object_test.cc (revision 3925)
|
| +++ runtime/vm/object_test.cc (working copy)
|
| @@ -16,7 +16,8 @@
|
| // Allocate the class first.
|
| const String& class_name = String::Handle(String::NewSymbol("MyClass"));
|
| const Script& script = Script::Handle();
|
| - const Class& cls = Class::Handle(Class::New(class_name, script));
|
| + const intptr_t kPos = 1; // Dummy token index in non-existing source.
|
| + const Class& cls = Class::Handle(Class::New(class_name, script, kPos));
|
|
|
| // Class has no fields.
|
| const Array& no_fields = Array::Handle(Array::Empty());
|
| @@ -94,10 +95,10 @@
|
| Class& interface = Class::Handle();
|
| String& interface_name = String::Handle();
|
| interface_name = String::NewSymbol("Harley");
|
| - interface = Class::New(interface_name, script);
|
| + interface = Class::New(interface_name, script, kPos);
|
| interfaces.SetAt(0, Type::Handle(Type::NewNonParameterizedType(interface)));
|
| interface_name = String::NewSymbol("Norton");
|
| - interface = Class::New(interface_name, script);
|
| + interface = Class::New(interface_name, script, kPos);
|
| interfaces.SetAt(1, Type::Handle(Type::NewNonParameterizedType(interface)));
|
| cls.set_interfaces(interfaces);
|
| cls.Finalize();
|
| @@ -152,7 +153,9 @@
|
| // Allocate the class first.
|
| String& class_name = String::Handle(String::NewSymbol("EmptyClass"));
|
| Script& script = Script::Handle();
|
| - const Class& empty_class = Class::Handle(Class::New(class_name, script));
|
| + const intptr_t kPos = 1; // Dummy token index in non-existing source.
|
| + const Class& empty_class =
|
| + Class::Handle(Class::New(class_name, script, kPos));
|
|
|
| // No functions and no super class for the EmptyClass.
|
| const Array& no_fields = Array::Handle(Array::Empty());
|
| @@ -163,7 +166,8 @@
|
| EXPECT_EQ(empty_class.raw(), instance.clazz());
|
|
|
| class_name = String::NewSymbol("OneFieldClass");
|
| - const Class& one_field_class = Class::Handle(Class::New(class_name, script));
|
| + const Class& one_field_class =
|
| + Class::Handle(Class::New(class_name, script, kPos));
|
|
|
| // No functions and no super class for the OneFieldClass.
|
| const Array& one_fields = Array::Handle(Array::New(1));
|
| @@ -182,14 +186,16 @@
|
| TEST_CASE(Interface) {
|
| String& class_name = String::Handle(String::NewSymbol("EmptyClass"));
|
| Script& script = Script::Handle();
|
| - const Class& factory_class = Class::Handle(Class::New(class_name, script));
|
| + const intptr_t kPos = 1; // Dummy token index in non-existing source.
|
| + const Class& factory_class =
|
| + Class::Handle(Class::New(class_name, script, kPos));
|
| const Array& no_fields = Array::Handle(Array::Empty());
|
| // Finalizes the class.
|
| factory_class.SetFields(no_fields);
|
|
|
| String& interface_name = String::Handle(String::NewSymbol("MyInterface"));
|
| const Class& interface =
|
| - Class::Handle(Class::NewInterface(interface_name, script));
|
| + Class::Handle(Class::NewInterface(interface_name, script, kPos));
|
| EXPECT(interface.is_interface());
|
| EXPECT(!factory_class.is_interface());
|
| EXPECT(!interface.HasFactoryClass());
|
| @@ -2144,7 +2150,8 @@
|
| // Allocate the class first.
|
| const String& class_name = String::Handle(String::NewSymbol("MyClass"));
|
| const Script& script = Script::Handle();
|
| - const Class& cls = Class::Handle(Class::New(class_name, script));
|
| + const intptr_t kPos = 1; // Dummy token index in non-existing source.
|
| + const Class& cls = Class::Handle(Class::New(class_name, script, kPos));
|
| const Array& functions = Array::Handle(Array::New(1));
|
|
|
| const Context& context = Context::Handle(Context::New(0));
|
| @@ -2349,7 +2356,9 @@
|
|
|
| static RawClass* CreateTestClass(const char* name) {
|
| const String& class_name = String::Handle(String::NewSymbol(name));
|
| - const Class& cls = Class::Handle(Class::New(class_name, Script::Handle()));
|
| + const intptr_t kPos = 1; // Dummy token index in non-existing source.
|
| + const Class& cls =
|
| + Class::Handle(Class::New(class_name, Script::Handle(), kPos));
|
| return cls.raw();
|
| }
|
|
|
|
|