Refactored accessors in mirrors from methods to properties.

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');
 
@@ skipping 71 matching lines @@
   /**
    * Perform static initialization of [world]. This should be run before
    * calling [HtmlDiff.run].
    */
   static void initialize(Path libDir) {
     _compilation = new Compilation.library(
         const <Path>[
             const Path(DOM_LIBRARY_NAME),
             const Path(HTML_LIBRARY_NAME)
         ], libDir);
-    _mirrors = _compilation.mirrors();
+    _mirrors = _compilation.mirrors;
 
     // Find 'dart:dom_deprecated' by its library tag 'dom'.
-    dom = findMirror(_mirrors.libraries(), DOM_LIBRARY_NAME);
+    dom = findMirror(_mirrors.libraries, DOM_LIBRARY_NAME);
   }
 
   HtmlDiff([bool printWarnings = false]) :
     _printWarnings = printWarnings,
     domToHtml = new Map<MemberMirror, Set<MemberMirror>>(),
     htmlToDom = new Map<String, Set<MemberMirror>>(),
     domTypesToHtml = new Map<String, Set<InterfaceMirror>>(),
     htmlTypesToDom = new Map<String, Set<InterfaceMirror>>(),
     comments = new CommentMap();
 
   void warn(String s) {
     if (_printWarnings) {
       print('Warning: $s');
     }
   }
 
   /**
    * Computes the `dart:dom_deprecated` to `dart:html` mapping, and
    * places it in [domToHtml], [htmlToDom], [domTypesToHtml], and
    * [htmlTypesToDom]. Before this is run, Frog should be initialized
    * (via [parseOptions] and [initializeWorld]) and
    * [HtmlDiff.initialize] should be called.
    */
   void run() {
-    LibraryMirror htmlLib = findMirror(_mirrors.libraries(), HTML_LIBRARY_NAME);
+    LibraryMirror htmlLib = findMirror(_mirrors.libraries, HTML_LIBRARY_NAME);
     if (htmlLib === null) {
       warn('Could not find $HTML_LIBRARY_NAME');
       return;
     }
-    for (InterfaceMirror htmlType in htmlLib.types().getValues()) {
+    for (InterfaceMirror htmlType in htmlLib.types.getValues()) {
       final domTypes = htmlToDomTypes(htmlType);
       if (domTypes.isEmpty()) continue;
 
-      htmlTypesToDom.putIfAbsent(htmlType.qualifiedName(),
+      htmlTypesToDom.putIfAbsent(htmlType.qualifiedName,
           () => new Set()).addAll(domTypes);
       domTypes.forEach((t) =>
-          domTypesToHtml.putIfAbsent(t.qualifiedName(),
+          domTypesToHtml.putIfAbsent(t.qualifiedName,
             () => new Set()).add(htmlType));
 
-      htmlType.declaredMembers().forEach(
+      htmlType.declaredMembers.forEach(
           (_, m) => _addMemberDiff(m, domTypes));
     }
   }
 
   /**
    * Records the `dart:dom_deprecated` to `dart:html` mapping for
    * [implMember] (from `dart:html`). [domTypes] are the
    * `dart:dom_deprecated` [Type]s that correspond to [implMember]'s
    * defining [Type].
    */
   void _addMemberDiff(MemberMirror htmlMember, List<TypeMirror> domTypes) {
     var domMembers = htmlToDomMembers(htmlMember, domTypes);
     if (htmlMember == null && !domMembers.isEmpty()) {
       warn('$HTML_LIBRARY_NAME member '
-           '${htmlMember.surroundingDeclaration().simpleName()}.'
-           '${htmlMember.simpleName()} has no corresponding '
+           '${htmlMember.surroundingDeclaration.simpleName}.'
+           '${htmlMember.simpleName} has no corresponding '
            '$HTML_LIBRARY_NAME member.');
     }
 
     if (htmlMember == null) return;
     if (!domMembers.isEmpty()) {
-      htmlToDom[htmlMember.qualifiedName()] = domMembers;
+      htmlToDom[htmlMember.qualifiedName] = domMembers;
     }
     domMembers.forEach((m) =>
         domToHtml.putIfAbsent(m, () => new Set()).add(htmlMember));
   }
 
   /**
    * Returns the `dart:dom_deprecated` [Type]s that correspond to
    * [htmlType] from `dart:html`. This can be the empty list if no
    * correspondence is found.
    */
   List<InterfaceMirror> htmlToDomTypes(InterfaceMirror htmlType) {
-    if (htmlType.simpleName() == null) return [];
-    final tags = _getTags(comments.find(htmlType.location()));
+    if (htmlType.simpleName == null) return [];
+    final tags = _getTags(comments.find(htmlType.location));
     if (tags.containsKey('domName')) {
       var domNames = <String>[];
       for (var s in tags['domName'].split(',')) {
         domNames.add(s.trim());
       }
       if (domNames.length == 1 && domNames[0] == 'none') return [];
       var domTypes = <InterfaceMirror>[];
       for (var domName in domNames) {
-        final domType = findMirror(dom.types(), domName);
+        final domType = findMirror(dom.types, domName);
         if (domType == null) {
           warn('no $DOM_LIBRARY_NAME type named $domName');
         } else {
           domTypes.add(domType);
         }
       }
       return domTypes;
     }
     return <InterfaceMirror>[];
   }
 
   /**
    * Returns the `dart:dom_deprecated` [Member]s that correspond to
    * [htmlMember] from `dart:html`. This can be the empty set if no
    * correspondence is found.  [domTypes] are the
    * `dart:dom_deprecated` [Type]s that correspond to [implMember]'s
    * defining [Type].
    */
   Set<MemberMirror> htmlToDomMembers(MemberMirror htmlMember,
                                      List<InterfaceMirror> domTypes) {
     if (htmlMember.isPrivate) return new Set();
-    final tags = _getTags(comments.find(htmlMember.location()));
+    final tags = _getTags(comments.find(htmlMember.location));
     if (tags.containsKey('domName')) {
       var domNames = <String>[];
       for (var s in tags['domName'].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('.')) {
             warn('no member $name');
           } else {
             final options = <String>[];
             for (var t in domTypes) {
-              options.add('${t.simpleName()}.${name}');
+              options.add('${t.simpleName}.${name}');
             }
             Strings.join(options, ' or ');
             warn('no member $options');
           }
         }
         members.addAll(nameMembers);
       });
       return members;
     }
 
@@ skipping 10 matching lines @@
    */
   Set<MemberMirror> _membersFromName(String name,
                                      List<InterfaceMirror> defaultTypes) {
     if (!name.contains('.', 0)) {
       if (defaultTypes.isEmpty()) {
         warn('no default type for ${name}');
         return new Set();
       }
       final members = new Set<MemberMirror>();
       defaultTypes.forEach((t) {
-        MemberMirror member = findMirror(t.declaredMembers(), name);
+        MemberMirror member = findMirror(t.declaredMembers, name);
         if (member !== null) {
           members.add(member);
         }
       });
       return members;
     }
 
     final splitName = name.split('.');
     if (splitName.length != 2) {
       warn('invalid member name ${name}');
       return new Set();
     }
 
     var typeName = splitName[0];
 
-    InterfaceMirror type = findMirror(dom.types(), typeName);
+    InterfaceMirror type = findMirror(dom.types, typeName);
     if (type == null) return new Set();
 
-    MemberMirror member = findMirror(type.declaredMembers(), splitName[1]);
+    MemberMirror member = findMirror(type.declaredMembers, splitName[1]);
     if (member == null) return new Set();
 
     return new Set.from([member]);
   }
 
   /**
    * Extracts a [Map] from tag names to values from [comment], which is parsed
    * from a Dart source file via dartdoc. Tags are of the form `@NAME VALUE`,
    * where `NAME` is alphabetic and `VALUE` can contain any character other than
    * `;`. Multiple tags can be separated by semicolons.
    *
    * At time of writing, the only tag that's used is `@domName`.
    */
   Map<String, String> _getTags(String comment) {
     if (comment == null) return const <String>{};
     final re = const RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)");
     final tags = <String>{};
     for (var m in re.allMatches(comment.trim())) {
       tags[m[1]] = m[2];
     }
     return tags;
   }
 }