Align source mirrors with runtime mirrors.

utils/apidoc/html_diff.dart

 // Copyright (c) 2012, 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.
 
 /**
  * A script to assist in documenting the difference between the dart:html API
  * and the old DOM API.
  */
 library html_diff;
 
 import 'dart:async';
-import 'dart:io';
 
 import 'lib/metadata.dart';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
-import '../../sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart';
-import '../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors.dart';
+import '../../sdk/lib/_internal/compiler/implementation/mirrors/analyze.dart';
+import '../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
 import '../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
 import '../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
-import '../../sdk/lib/_internal/dartdoc/lib/dartdoc.dart';
-import '../../sdk/lib/html/html_common/metadata.dart';
 
 // TODO(amouravski): There is currently magic that looks at dart:* libraries
 // rather than the declared library names. This changed due to recent syntax
 // changes. We should only need to look at the library 'html'.
 final List<Uri> HTML_LIBRARY_URIS = [
     new Uri(scheme: 'dart', path: 'html'),
     new Uri(scheme: 'dart', path: 'indexed_db'),
     new Uri(scheme: 'dart', path: 'svg'),
     new Uri(scheme: 'dart', path: 'web_audio')];
 
@@ skipping 63 matching lines @@
         HTML_LIBRARY_URIS, libraryRoot, null,
         provider.readStringFromUri,
         handler.diagnosticHandler);
     analysis.then((MirrorSystem mirrors) {
       for (var libraryUri in HTML_LIBRARY_URIS) {
         var library = mirrors.libraries[libraryUri];
         if (library == null) {
           warn('Could not find $libraryUri');
           result.complete(false);
         }
-        for (ClassMirror type in library.classes.values) {
+        for (ClassMirror type in classesOf(library.declarations)) {
           final domTypes = htmlToDomTypes(type);
           if (domTypes.isEmpty) continue;
 
-          htmlTypesToDom.putIfAbsent(type.qualifiedName,
+          htmlTypesToDom.putIfAbsent(qualifiedNameOf(type),
               () => new Set()).addAll(domTypes);
 
-          type.members.forEach(
-              (_, m) => _addMemberDiff(m, domTypes, library.simpleName));
+          membersOf(type.declarations).forEach(
+              (m) => _addMemberDiff(m, domTypes, nameOf(library)));
         }
       }
       result.complete(true);
     });
     return result.future;
   }
 
   /**
    * Records the `@DomName` to `dart:html` mapping for
    * [htmlMember] (from `dart:html`). [domTypes] are the
    * `@DomName` type values that correspond to [htmlMember]'s
    * defining type.
    */
-  void _addMemberDiff(MemberMirror htmlMember, List<String> domTypes,
+  void _addMemberDiff(DeclarationMirror htmlMember, List<String> domTypes,
       String libraryName) {
     var domMembers = htmlToDomMembers(htmlMember, domTypes);
     if (htmlMember == null && !domMembers.isEmpty) {
       warn('$libraryName member '
            '${htmlMember.owner.simpleName}.'
            '${htmlMember.simpleName} has no corresponding '
            '$libraryName member.');
     }
 
     if (htmlMember == null) return;
     if (!domMembers.isEmpty) {
-      htmlToDom[htmlMember.qualifiedName] = domMembers;
+      htmlToDom[qualifiedNameOf(htmlMember)] = domMembers;
     }
   }
 
   /**
    * Returns the `@DomName` type values that correspond to
    * [htmlType] from `dart:html`. This can be the empty list if no
    * correspondence is found.
    */
   List<String> htmlToDomTypes(ClassMirror htmlType) {
     if (htmlType.simpleName == null) return <String>[];
 
     final domNameMetadata = findMetadata(htmlType.metadata, 'DomName');
     if (domNameMetadata != null) {
       var domNames = <String>[];
-      var names = domNameMetadata.getField('name');
+      var names = domNameMetadata.getField(symbolOf('name'));
       for (var s in names.reflectee.split(',')) {
         domNames.add(s.trim());
       }
 
       if (domNames.length == 1 && domNames[0] == 'none') return <String>[];
       return domNames;
     }
     return <String>[];
   }
 
   /**
    * Returns the `@DomName` member values that correspond to
    * [htmlMember] from `dart:html`. This can be the empty set if no
    * correspondence is found.  [domTypes] are the
    * `@DomName` type values that correspond to [htmlMember]'s
    * defining type.
    */
-  Set<String> htmlToDomMembers(MemberMirror htmlMember, List<String> domTypes) {
+  Set<String> htmlToDomMembers(DeclarationMirror htmlMember,
+                               List<String> domTypes) {
     if (htmlMember.isPrivate) return new Set();
 
     final domNameMetadata = findMetadata(htmlMember.metadata, 'DomName');
     if (domNameMetadata != null) {
       var domNames = <String>[];
-      var names = domNameMetadata.getField('name');
+      var names = domNameMetadata.getField(symbolOf('name'));
       for (var s in names.reflectee.split(',')) {
         domNames.add(s.trim());
       }
 
       if (domNames.length == 1 && domNames[0] == 'none') return new Set();
       final members = new Set();
       domNames.forEach((name) {
         var nameMembers = _membersFromName(name, domTypes);
         if (nameMembers.isEmpty) {
           if (name.contains('.')) {
@@ skipping 34 matching lines @@
       return members;
     }
 
     if (name.split('.').length != 2) {
       warn('invalid member name ${name}');
       return new Set();
     }
     return new Set.from([name]);
   }
 }