languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-20 09:54:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove Declaration.computeLibraryUri

Browse source 
Change-Id: I8ab2d15f83e9547f19301b12d0bff9f1dc05de46
Reviewed-on: https://dart-review.googlesource.com/57561
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>
This commit is contained in:
Peter von der Ahé 2018-05-31 10:31:53 +00:00 committed by commit-bot@chromium.org
parent 5ecd78222e
commit b851714bb7
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/front_end/lib/src/fasta/builder/declaration.dart
View file

@ -4,9 +4,7 @@
library fasta.declaration;
import '../problems.dart' show unhandled, unsupported;
import 'library_builder.dart' show LibraryBuilder;
import '../problems.dart' show unsupported;
abstract class Declaration {
/// Used when multiple things with the same name are declared within the same
@ -62,15 +60,6 @@ abstract class Declaration {
bool get isTypeVariable => false;
Uri computeLibraryUri() {
Declaration declaration = this;
do {
if (declaration is LibraryBuilder) return declaration.uri;
declaration = declaration.parent;
} while (declaration != null);
return unhandled("no library parent", "${runtimeType}", -1, null);
}
/// Applies [patch] to this declaration.
void applyPatch(Declaration patch) {
unsupported("${runtimeType}.applyPatch", charOffset, fileUri);

16
pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart
View file

@ -890,10 +890,10 @@ class KernelLibraryBuilder
if (scope.local[name] == declaration) {
isLocal = true;
preferred = declaration;
hiddenUri = other.computeLibraryUri();
hiddenUri = computeLibraryUri(other);
} else {
uri = declaration.computeLibraryUri();
otherUri = other.computeLibraryUri();
uri = computeLibraryUri(declaration);
otherUri = computeLibraryUri(other);
if (declaration is LoadLibraryBuilder) {
isLoadLibrary = true;
preferred = declaration;
@ -1139,3 +1139,13 @@ class KernelLibraryBuilder
addToExportScope(name, member);
}
}
Uri computeLibraryUri(Declaration declaration) {
Declaration current = declaration;
do {
if (current is LibraryBuilder) return current.uri;
current = current.parent;
} while (current != null);
return unhandled("no library parent", "${declaration.runtimeType}",
declaration.charOffset, declaration.fileUri);
}