| Index: pkg/front_end/lib/src/fasta/source/source_loader.dart
|
| diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
|
| index 6b9b14d4c00589979a961a0471366739c24d7b09..e8c9a14780861ae7a3b2ab99387edd350c39382b 100644
|
| --- a/pkg/front_end/lib/src/fasta/source/source_loader.dart
|
| +++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart
|
| @@ -4,71 +4,47 @@
|
|
|
| library fasta.source_loader;
|
|
|
| -import 'dart:async' show
|
| - Future;
|
| +import 'dart:async' show Future;
|
|
|
| -import 'dart:io' show
|
| - FileSystemException;
|
| +import 'dart:io' show FileSystemException;
|
|
|
| -import 'package:front_end/src/fasta/scanner/io.dart' show
|
| - readBytesFromFile;
|
| +import 'package:front_end/src/fasta/scanner/io.dart' show readBytesFromFile;
|
|
|
| -import 'package:front_end/src/fasta/scanner.dart' show
|
| - ErrorToken,
|
| - ScannerResult,
|
| - Token,
|
| - scan;
|
| +import 'package:front_end/src/fasta/scanner.dart'
|
| + show ErrorToken, ScannerResult, Token, scan;
|
|
|
| -import 'package:front_end/src/fasta/parser/class_member_parser.dart' show
|
| - ClassMemberParser;
|
| +import 'package:front_end/src/fasta/parser/class_member_parser.dart'
|
| + show ClassMemberParser;
|
|
|
| -import 'package:kernel/ast.dart' show
|
| - Program;
|
| +import 'package:kernel/ast.dart' show Program;
|
|
|
| -import 'package:kernel/class_hierarchy.dart' show
|
| - ClassHierarchy;
|
| +import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
|
|
|
| -import 'package:kernel/core_types.dart' show
|
| - CoreTypes;
|
| +import 'package:kernel/core_types.dart' show CoreTypes;
|
|
|
| -import '../errors.dart' show
|
| - inputError,
|
| - printUnexpected;
|
| +import '../errors.dart' show inputError, printUnexpected;
|
|
|
| -import '../messages.dart' show
|
| - warning;
|
| +import '../messages.dart' show warning;
|
|
|
| -import '../export.dart' show
|
| - Export;
|
| +import '../export.dart' show Export;
|
|
|
| -import '../analyzer/element_store.dart' show
|
| - ElementStore;
|
| +import '../analyzer/element_store.dart' show ElementStore;
|
|
|
| -import '../builder/builder.dart' show
|
| - Builder,
|
| - ClassBuilder,
|
| - LibraryBuilder;
|
| +import '../builder/builder.dart' show Builder, ClassBuilder, LibraryBuilder;
|
|
|
| -import 'outline_builder.dart' show
|
| - OutlineBuilder;
|
| +import 'outline_builder.dart' show OutlineBuilder;
|
|
|
| -import '../loader.dart' show
|
| - Loader;
|
| +import '../loader.dart' show Loader;
|
|
|
| -import '../target_implementation.dart' show
|
| - TargetImplementation;
|
| +import '../target_implementation.dart' show TargetImplementation;
|
|
|
| -import 'diet_listener.dart' show
|
| - DietListener;
|
| +import 'diet_listener.dart' show DietListener;
|
|
|
| -import 'diet_parser.dart' show
|
| - DietParser;
|
| +import 'diet_parser.dart' show DietParser;
|
|
|
| -import 'source_library_builder.dart' show
|
| - SourceLibraryBuilder;
|
| +import 'source_library_builder.dart' show SourceLibraryBuilder;
|
|
|
| -import '../ast_kind.dart' show
|
| - AstKind;
|
| +import '../ast_kind.dart' show AstKind;
|
|
|
| class SourceLoader<L> extends Loader<L> {
|
| final Map<Uri, List<int>> sourceBytes = <Uri, List<int>>{};
|
| @@ -80,8 +56,7 @@ class SourceLoader<L> extends Loader<L> {
|
| // Used when building analyzer ASTs.
|
| ElementStore elementStore;
|
|
|
| - SourceLoader(TargetImplementation target)
|
| - : super(target);
|
| + SourceLoader(TargetImplementation target) : super(target);
|
|
|
| Future<Token> tokenize(SourceLibraryBuilder library,
|
| {bool suppressLexicalErrors: false}) async {
|
| @@ -149,14 +124,14 @@ class SourceLoader<L> extends Loader<L> {
|
| void resolveParts() {
|
| List<Uri> parts = <Uri>[];
|
| builders.forEach((Uri uri, LibraryBuilder library) {
|
| - if (library is SourceLibraryBuilder) {
|
| - if (library.isPart) {
|
| - library.validatePart();
|
| - parts.add(uri);
|
| - } else {
|
| - library.includeParts();
|
| - }
|
| + if (library is SourceLibraryBuilder) {
|
| + if (library.isPart) {
|
| + library.validatePart();
|
| + parts.add(uri);
|
| + } else {
|
| + library.includeParts();
|
| }
|
| + }
|
| });
|
| parts.forEach(builders.remove);
|
| ticker.logMs("Resolved parts");
|
| @@ -347,7 +322,10 @@ class SourceLoader<L> extends Loader<L> {
|
| reported.add(cls);
|
| }
|
| }
|
| - warning(cls.fileUri, cls.charOffset, "'${cls.name}' is a supertype of "
|
| + warning(
|
| + cls.fileUri,
|
| + cls.charOffset,
|
| + "'${cls.name}' is a supertype of "
|
| "itself via '${involved.map((c) => c.name).join(' ')}'.");
|
| }
|
| });
|
|
|