Store actual Reference(s) for additional exports.

pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.dill_library_builder;
 
-import 'dart:convert' show JSON;
-
 import 'package:kernel/ast.dart'
-    show
-        Class,
-        Field,
-        Library,
-        ListLiteral,
-        Member,
-        StaticGet,
-        StringLiteral,
-        Typedef;
-
-import '../fasta_codes.dart' show templateUnspecified;
+    show Class, Field, Library, ListLiteral, Member, StaticGet, Typedef;
+import 'package:kernel/ast.dart';

[ahe, 2017/08/30 14:24:52]

Remove the second import of kernel/ast.dart.

[scheglov, 2017/08/30 16:56:49]

Done.

 
 import '../problems.dart' show unimplemented;
 
 import '../kernel/kernel_builder.dart'
     show
         Builder,
         InvalidTypeBuilder,
         KernelInvalidTypeBuilder,
         KernelTypeBuilder,
         LibraryBuilder,
         Scope;
 
 import '../kernel/redirecting_factory_body.dart' show RedirectingFactoryBody;
 
 import 'dill_class_builder.dart' show DillClassBuilder;
 
 import 'dill_member_builder.dart' show DillMemberBuilder;
 
 import 'dill_loader.dart' show DillLoader;
 
 import 'dill_typedef_builder.dart' show DillFunctionTypeAliasBuilder;
 
 class DillLibraryBuilder extends LibraryBuilder<KernelTypeBuilder, Library> {
   final Uri uri;
 
   final DillLoader loader;
 
   Library library;
 
-  /// Exports in addition to the members declared in this library.
-  ///
-  /// Each entry in the list is either two or three elements long.
-  ///
-  /// The first element is the library URI, if it is null, this is an ambiguous
-  /// export and the list has three elements. Otherwise the list has two
-  /// elements.
-  ///
-  /// The second element is the name of the exported element.
-  ///
-  /// The third element (if present) is an error message.
-  List<List<String>> additionalExports;
+  /// References to nodes exported by the `export` directives, don't conflict

[ahe, 2017/08/30 14:24:52]

Consider this:

/// References to nodes exported by `export` declarations that:
/// - aren't ambiguous, or
/// - aren't hidden by local declarations.

[scheglov, 2017/08/30 16:56:49]

Done.

+  /// with each other, and not are hidden by local declarations.
+  List<Reference> additionalExports;
 
   DillLibraryBuilder(this.uri, this.loader)
       : super(uri, new Scope.top(), new Scope.top());
 
   Uri get fileUri => uri;
 
   @override
   Library get target => library;
 
   void addClass(Class cls) {
     DillClassBuilder classBulder = new DillClassBuilder(cls, this);
     addBuilder(cls.name, classBulder, cls.fileOffset);
     cls.procedures.forEach(classBulder.addMember);
     cls.constructors.forEach(classBulder.addMember);
     for (Field field in cls.fields) {
       if (field.name.name == "_redirecting#") {
         ListLiteral initializer = field.initializer;
         for (StaticGet get in initializer.expressions) {
           RedirectingFactoryBody.restoreFromDill(get.target);
         }
         initializer.expressions.clear();
       } else {
         classBulder.addMember(field);
       }
     }
   }
 
   void addMember(Member member) {
     String name = member.name.name;
-    if (name == "_exports#") {
-      Field field = member;
-      StringLiteral string = field.initializer;
-      additionalExports = JSON.decode(string.value);
-    } else {
-      addBuilder(name, new DillMemberBuilder(member, this), member.fileOffset);
-    }
+    addBuilder(name, new DillMemberBuilder(member, this), member.fileOffset);
   }
 
   Builder addBuilder(String name, Builder builder, int charOffset) {
     if (name == null || name.isEmpty) return null;
     bool isSetter = builder.isSetter;
     if (isSetter) {
       scopeBuilder.addSetter(name, builder);
     } else {
       scopeBuilder.addMember(name, builder);
     }
@@ skipping 30 matching lines @@
     if (builder.parent == this) return builder;
     return new KernelInvalidTypeBuilder(name, charOffset, fileUri);
   }
 
   @override
   String get fullNameForErrors {
     return library.name ?? "<library '${library.fileUri}'>";
   }
 
   void finalizeExports() {
-    if (additionalExports != null) {
-      for (List<String> additionalExport in additionalExports) {
-        String uriString = additionalExport[0];
-        String name = additionalExport[1];
-        Builder builder;
-        if (uriString == null) {
-          builder = new KernelInvalidTypeBuilder(name, -1, null,
-              templateUnspecified.withArguments(additionalExport[2]));
-        } else {
-          DillLibraryBuilder library = loader.read(uri.resolve(uriString), -1);
-          builder = library?.exportScopeBuilder[name] ??
-              new KernelInvalidTypeBuilder(name, -1, null);
-        }
+    for (var reference in library.additionalExports) {
+      var node = reference.node;
+      Uri libraryUri;
+      String name;
+      if (node is Class) {
+        libraryUri = node.enclosingLibrary.importUri;
+        name = node.name;
+      } else if (node is Member) {
+        libraryUri = node.enclosingLibrary.importUri;
+        name = node.name.name;
+      } else if (node is Typedef) {
+        libraryUri = node.enclosingLibrary.importUri;
+        name = node.name;
+      } else {
+        unimplemented('${node.runtimeType}', -1, uri);
+      }
+      var library = loader.read(libraryUri, -1);
+      Builder builder = library.exportScopeBuilder[name];

[ahe, 2017/08/30 14:24:52]

assert(node == builder.target);

[scheglov, 2017/08/30 16:56:50]

Done.

+      if (builder.isSetter) {
+        exportScopeBuilder.addSetter(name, builder);
+      } else {
         exportScopeBuilder.addMember(name, builder);
       }
     }
   }
 }