languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-05 00:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CFE] Add support looking up extension members to LibraryIndex

Browse source 
Change-Id: I911b5034c871507cbb051264bac6bbd9b7eef26a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135462
Reviewed-by: Jens Johansen <jensj@google.com>
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>
This commit is contained in:
Daco Harkes 2020-02-14 15:46:37 +00:00 committed by commit-bot@chromium.org
parent af7270cb23
commit eceb249f88
1 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
pkg/kernel/lib/library_index.dart
View file

@ -139,12 +139,18 @@ class _ClassTable {
_classes = <String, _MemberTable>{};
_classes[LibraryIndex.topLevel] = new _MemberTable.topLevel(this);
for (var class_ in library.classes) {
_classes[class_.name] = new _MemberTable(this, class_);
_classes[class_.name] = new _MemberTable.fromClass(this, class_);
}
for (var extension_ in library.extensions) {
_classes[extension_.name] =
new _MemberTable.fromExtension(this, extension_);
}
for (Reference reference in library.additionalExports) {
NamedNode node = reference.node;
if (node is Class) {
_classes[node.name] = new _MemberTable(this, node);
_classes[node.name] = new _MemberTable.fromClass(this, node);
} else if (node is Extension) {
_classes[node.name] = new _MemberTable.fromExtension(this, node);
}
}
}
@ -182,14 +188,17 @@ class _ClassTable {
class _MemberTable {
final _ClassTable parent;
final Class class_; // Null for top-level.
final Class class_; // Null for top-level or extension.
final Extension extension_; // Null for top-level or class.
Map<String, Member> _members;
Library get library => parent.library;
_MemberTable(this.parent, this.class_);
_MemberTable.topLevel(this.parent) : class_ = null;
_MemberTable.fromClass(this.parent, this.class_) : extension_ = null;
_MemberTable.fromExtension(this.parent, this.extension_) : class_ = null;
_MemberTable.topLevel(this.parent)
: class_ = null,
extension_ = null;
Map<String, Member> get members {
if (_members == null) {
@ -198,6 +207,8 @@ class _MemberTable {
class_.procedures.forEach(addMember);
class_.fields.forEach(addMember);
class_.constructors.forEach(addMember);
} else if (extension_ != null) {
extension_.members.forEach(addExtensionMember);
} else {
library.procedures.forEach(addMember);
library.fields.forEach(addMember);
@ -223,11 +234,38 @@ class _MemberTable {
_members[getDisambiguatedName(member)] = member;
}
String getDisambiguatedExtensionName(
ExtensionMemberDescriptor extensionMember) {
if (extensionMember.kind == ExtensionMemberKind.TearOff)
return 'get#' + extensionMember.name.name;
if (extensionMember.kind == ExtensionMemberKind.Getter)
return LibraryIndex.getterPrefix + extensionMember.name.name;
if (extensionMember.kind == ExtensionMemberKind.Setter)
return LibraryIndex.setterPrefix + extensionMember.name.name;
return extensionMember.name.name;
}
void addExtensionMember(ExtensionMemberDescriptor extensionMember) {
final replacement = extensionMember.member.node;
if (replacement is! Member) return;
Member member = replacement;
if (member.name.isPrivate && member.name.library != library) {
// Members whose name is private to other libraries cannot currently
// be found with the LibraryIndex class.
return;
}
final name = getDisambiguatedExtensionName(extensionMember);
_members[name] = replacement;
}
String get containerName {
if (class_ == null) {
return "top-level of ${parent.containerName}";
} else {
if (class_ != null) {
return "class '${class_.name}' in ${parent.containerName}";
} else if (extension_ != null) {
return "extension '${extension_.name}' in ${parent.containerName}";
} else {
return "top-level of ${parent.containerName}";
}
}