Index: runtime/vm/parser.cc |
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc |
index d00006bb7ab776e120967eb885996d606b3f1e85..114694078f53c19f34dfcd8364f246430ba93a0e 100644 |
--- a/runtime/vm/parser.cc |
+++ b/runtime/vm/parser.cc |
@@ -1299,17 +1299,17 @@ static RawClass* LookupImplClass(const String& class_name) { |
} |
-// Lookup class in the coreimpl lib which also contains various VM |
+// Lookup class in the core lib which also contains various VM |
// helper methods and classes. Allow look up of private classes. |
-static RawClass* LookupCoreImplClass(const String& class_name) { |
- const Library& coreimpl_lib = Library::Handle(Library::CoreImplLibrary()); |
+static RawClass* LookupCoreClass(const String& class_name) { |
+ const Library& core_lib = Library::Handle(Library::CoreLibrary()); |
String& name = String::Handle(class_name.raw()); |
if (class_name.CharAt(0) == Scanner::kPrivateIdentifierStart) { |
// Private identifiers are mangled on a per script basis. |
- name = String::Concat(name, String::Handle(coreimpl_lib.private_key())); |
+ name = String::Concat(name, String::Handle(core_lib.private_key())); |
name = Symbols::New(name); |
} |
- return coreimpl_lib.LookupClass(name); |
+ return core_lib.LookupClass(name); |
} |
@@ -8641,7 +8641,7 @@ AstNode* Parser::ParseListLiteral(intptr_t type_pos, |
String& list_literal_factory_class_name = String::Handle( |
Symbols::ListLiteralFactoryClass()); |
const Class& list_literal_factory_class = |
- Class::Handle(LookupCoreImplClass(list_literal_factory_class_name)); |
+ Class::Handle(LookupCoreClass(list_literal_factory_class_name)); |
ASSERT(!list_literal_factory_class.IsNull()); |
const String& list_literal_factory_name = |
String::Handle(Symbols::ListLiteralFactory()); |
@@ -8866,7 +8866,7 @@ AstNode* Parser::ParseMapLiteral(intptr_t type_pos, |
String& map_literal_factory_class_name = String::Handle( |
Symbols::MapLiteralFactoryClass()); |
const Class& map_literal_factory_class = |
- Class::Handle(LookupCoreImplClass(map_literal_factory_class_name)); |
+ Class::Handle(LookupCoreClass(map_literal_factory_class_name)); |
ASSERT(!map_literal_factory_class.IsNull()); |
const String& map_literal_factory_name = |
String::Handle(Symbols::MapLiteralFactory()); |