Add ImportElement and ExportElement

tests/compiler/dart2js/serialization_test.dart

 // Copyright (c) 2015, 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 dart2js.serialization_test;
 
 import 'dart:io';
 import 'memory_compiler.dart';
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/constants/constructors.dart';
@@ skipping 409 matching lines @@
   }
 
   @override
   void visitParameterElement(ParameterElement element1,
                              ParameterElement element2) {
     check(element1, element2,
           'name',
           element1.name, element2.name);
     visit(element1.functionDeclaration, element2.functionDeclaration);
   }
+
+  @override
+  void visitImportElement(ImportElement element1, ImportElement element2) {
+    visit(element1.importedLibrary, element2.importedLibrary);
+    visit(element1.library, element2.library);
+  }
+
+  @override
+  void visitExportElement(ExportElement element1, ExportElement element2) {
+    visit(element1.exportedLibrary, element2.exportedLibrary);
+    visit(element1.library, element2.library);
+  }
+
+  @override
+  void visitPrefixElement(PrefixElement element1, PrefixElement element2) {
+    check(element1, element2,
+          'name',
+          element1.name, element2.name);
+    visit(element1.library, element2.library);
+  }
 }
 
 /// Visitor that checks for equivalence of [Element] properties.
 class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
   const ElementPropertyEquivalence();
 
   void visit(Element element1, Element element2) {
     if (element1 == element2) return;
     check(element1, element2, 'kind', element1.kind, element2.kind);
     element1.accept(this, element2);
   }
 
   @override
   void visitElement(Element e, Element arg) {
     throw new UnsupportedError("Unsupported element $e");
   }
 
   @override
   void visitLibraryElement(LibraryElement element1, LibraryElement element2) {
     checkElementIdentities(null, null, null, element1, element2);
     check(element1, element2, 'name', element1.name, element2.name);
     check(element1, element2, 'getLibraryName',
-          element1.getLibraryName(), element2.getLibraryName());
+          element1.libraryName, element2.libraryName);
     visitMembers(element1, element2);
     visit(element1.entryCompilationUnit, element2.entryCompilationUnit);
     checkElementLists(
         element1, element2, 'compilationUnits',
         element1.compilationUnits.toList(),
         element2.compilationUnits.toList());
 
-    bool filterTags(LibraryTag tag) => tag.asLibraryDependency() != null;
-
-    List<LibraryTag> tags1 = element1.tags.where(filterTags).toList();
-    List<LibraryTag> tags2 = element2.tags.where(filterTags).toList();
-    checkListEquivalence(element1, element2, 'tags', tags1, tags2,
-        (Object object1, Object object2, String property,
-         LibraryDependency tag1, LibraryDependency tag2) {
-      checkElementIdentities(
-          tag1, tag2, 'getLibraryFromTag',
-          element1.getLibraryFromTag(tag1),
-          element2.getLibraryFromTag(tag2));
-    });
+    checkElementListIdentities(
+        element1, element2, 'imports', element1.imports, element2.imports);
+    checkElementListIdentities(
+        element1, element2, 'exports', element1.exports, element2.exports);
 
     List<Element> imports1 = <Element>[];
     List<Element> imports2 = <Element>[];
     element1.forEachImport((Element import) {
       if (import.isAmbiguous) return;
       imports1.add(import);
     });
     element2.forEachImport((Element import) {
       if (import.isAmbiguous) return;
       imports2.add(import);
     });
     checkElementListIdentities(
-        element1, element2, 'imports', imports1, imports2);
+        element1, element2, 'importScope', imports1, imports2);
 
     List<Element> exports1 = <Element>[];
     List<Element> exports2 = <Element>[];
     element1.forEachExport((Element export) {
       if (export.isAmbiguous) return;
       exports1.add(export);
     });
     element2.forEachExport((Element export) {
       if (export.isAmbiguous) return;
       exports2.add(export);
     });
     checkElementListIdentities(
-        element1, element2, 'exports', exports1, exports2);
+        element1, element2, 'exportScope', exports1, exports2);
   }
 
   @override
   void visitCompilationUnitElement(CompilationUnitElement element1,
                                    CompilationUnitElement element2) {
     check(element1, element2,
           'name',
           element1.name, element2.name);
     checkElementIdentities(
         element1, element2, 'library',
@@ skipping 264 matching lines @@
   }
 
   @override
   void visitFieldParameterElement(InitializingFormalElement element1,
                                   InitializingFormalElement element2) {
     visitParameterElement(element1, element2);
     checkElementIdentities(
         element1, element2, 'fieldElement',
         element1.fieldElement, element2.fieldElement);
   }
+
+  @override
+  void visitImportElement(ImportElement element1, ImportElement element2) {
+    check(element1, element2, 'uri', element1.uri, element2.uri);
+    check(
+        element1, element2, 'isDeferred',
+        element1.isDeferred, element2.isDeferred);
+    checkElementProperties(
+        element1, element2, 'prefix',
+        element1.prefix, element2.prefix);
+    checkElementIdentities(
+        element1, element2, 'importedLibrary',
+        element1.importedLibrary, element2.importedLibrary);
+  }
+
+  @override
+  void visitExportElement(ExportElement element1, ExportElement element2) {
+    check(element1, element2, 'uri', element1.uri, element2.uri);
+    checkElementIdentities(
+        element1, element2, 'importedLibrary',
+        element1.exportedLibrary, element2.exportedLibrary);
+  }
+
+  @override
+  void visitPrefixElement(PrefixElement element1, PrefixElement element2) {
+    check(
+        element1, element2, 'isDeferred',
+        element1.isDeferred, element2.isDeferred);
+    checkElementIdentities(
+        element1, element2, 'importedLibrary',
+        element1.deferredImport, element2.deferredImport);
+    // TODO(johnniwinther): Check members.
+  }
 }
 
 /// Visitor that checks for equivalence of [DartType]s.
 class TypeEquivalence implements DartTypeVisitor<dynamic, DartType> {
   const TypeEquivalence();
 
   void visit(DartType type1, DartType type2) {
     check(type1, type2, 'kind', type1.kind, type2.kind);
     type1.accept(this, type2);
   }
@@ skipping 251 matching lines @@
         exp1, exp2, 'expression',
         exp1.expression, exp2.expression);
   }
 
   @override
   visitDeferred(DeferredConstantExpression exp1,
                 DeferredConstantExpression exp2) {
     // TODO: implement visitDeferred
   }
 }