| OLD | NEW | 
|---|
| 1 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file | 1 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file | 
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a | 
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. | 
| 4 | 4 | 
| 5 library fasta.dill_loader; | 5 library fasta.dill_loader; | 
| 6 | 6 | 
| 7 import 'dart:async' show Future; | 7 import 'dart:async' show Future; | 
| 8 | 8 | 
| 9 import 'package:kernel/ast.dart' show Library, Program; | 9 import 'package:kernel/ast.dart' show Library, Program; | 
| 10 | 10 | 
| 11 import '../loader.dart' show Loader; | 11 import '../loader.dart' show Loader; | 
| 12 import '../target_implementation.dart' show TargetImplementation; | 12 import '../target_implementation.dart' show TargetImplementation; | 
| 13 import 'dill_library_builder.dart' show DillLibraryBuilder; | 13 import 'dill_library_builder.dart' show DillLibraryBuilder; | 
| 14 | 14 | 
| 15 class DillLoader extends Loader<Library> { | 15 class DillLoader extends Loader<Library> { | 
| 16   /// Source targets are compiled against these binary libraries. | 16   /// Source targets are compiled against these binary libraries. | 
| 17   final libraries = <Library>[]; | 17   final libraries = <Library>[]; | 
| 18 | 18 | 
| 19   DillLoader(TargetImplementation target) : super(target); | 19   DillLoader(TargetImplementation target) : super(target); | 
| 20 | 20 | 
| 21   /// Append compiled libraries from the given [program]. If the [filter] is | 21   /// Append compiled libraries from the given [program]. If the [filter] is | 
| 22   /// provided, append only libraries whose [Uri] is accepted by the [filter]. | 22   /// provided, append only libraries whose [Uri] is accepted by the [filter]. | 
| 23   void appendLibraries(Program program, [bool filter(Uri uri)]) { | 23   List<DillLibraryBuilder> appendLibraries(Program program, | 
|  | 24       [bool filter(Uri uri)]) { | 
|  | 25     var builders = <DillLibraryBuilder>[]; | 
| 24     for (Library library in program.libraries) { | 26     for (Library library in program.libraries) { | 
| 25       if (filter == null || filter(library.importUri)) { | 27       if (filter == null || filter(library.importUri)) { | 
| 26         libraries.add(library); | 28         libraries.add(library); | 
| 27         read(library.importUri).library = library; | 29         DillLibraryBuilder builder = read(library.importUri); | 
|  | 30         builder.library = library; | 
|  | 31         builders.add(builder); | 
| 28       } | 32       } | 
| 29     } | 33     } | 
|  | 34     return builders; | 
| 30   } | 35   } | 
| 31 | 36 | 
| 32   Future<Null> buildBody(DillLibraryBuilder builder) { | 37   Future<Null> buildBody(DillLibraryBuilder builder) { | 
| 33     return buildOutline(builder); | 38     return buildOutline(builder); | 
| 34   } | 39   } | 
| 35 | 40 | 
| 36   Future<Null> buildOutline(DillLibraryBuilder builder) async { | 41   Future<Null> buildOutline(DillLibraryBuilder builder) async { | 
| 37     builder.library.classes.forEach(builder.addClass); | 42     builder.library.classes.forEach(builder.addClass); | 
| 38     builder.library.procedures.forEach(builder.addMember); | 43     builder.library.procedures.forEach(builder.addMember); | 
| 39     builder.library.typedefs.forEach(builder.addTypedef); | 44     builder.library.typedefs.forEach(builder.addTypedef); | 
| 40     builder.library.fields.forEach(builder.addMember); | 45     builder.library.fields.forEach(builder.addMember); | 
| 41   } | 46   } | 
| 42 | 47 | 
| 43   DillLibraryBuilder read(Uri uri, [Uri fileUri]) => super.read(uri, fileUri); | 48   DillLibraryBuilder read(Uri uri, [Uri fileUri]) => super.read(uri, fileUri); | 
| 44 } | 49 } | 
| OLD | NEW | 
|---|