Enable new dart:html wrapperless frog bindings and wrapper dartium bindings.

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:coreimpl');
 #import('../../frog/lang.dart');
 #import('../../frog/file_system_vm.dart');
 #import('../../frog/file_system.dart');
 #import('../../lib/dartdoc/dartdoc.dart');
 
 /**
  * A class for computing a many-to-many mapping between the types and members in
  * `dart:dom` and `dart:html`. This mapping is based on two indicators:
  *
  *   1. Auto-detected wrappers. Most `dart:html` types correspond
  *      straightforwardly to a single `dart:dom` type, and have the same name.
- *      In addition, most `dart:htmlimpl` methods just call a single `dart:dom`
+ *      In addition, most `dart:html` methods just call a single `dart:dom`
  *      method. This class detects these simple correspondences automatically.
  *
  *   2. Manual annotations. When it's not clear which `dart:dom` items a given
- *      `dart:html` item corresponds to, the `dart:htmlimpl` item can be
+ *      `dart:html` item corresponds to, the `dart:html` item can be
  *      annotated in the documentation comments using the `@domName` annotation.
  *
  * The `@domName` annotations for types and members are of the form `@domName
  * NAME(, NAME)*`, where the `NAME`s refer to the `dart:dom` types/members that
- * correspond to the annotated `dart:htmlimpl` type/member. `NAME`s on member
+ * correspond to the annotated `dart:html` type/member. `NAME`s on member
  * annotations can refer to either fully-qualified member names (e.g.
  * `Document.createElement`) or unqualified member names (e.g. `createElement`).
  * Unqualified member names are assumed to refer to members of one of the
  * corresponding `dart:dom` types.
  */
 class HtmlDiff {
   /** A map from `dart:dom` members to corresponding `dart:html` members. */
   final Map<Member, Set<Member>> domToHtml;
 
   /** A map from `dart:html` members to corresponding `dart:dom` members. */
   final Map<Member, Set<Member>> htmlToDom;
 
   /** A map from `dart:dom` types to corresponding `dart:html` types. */
   final Map<Type, Set<Type>> domTypesToHtml;
 
   /** A map from `dart:html` types to corresponding `dart:dom` types. */
   final Map<Type, Set<Type>> htmlTypesToDom;
 
   final CommentMap comments;
 
   static Library dom;
 
   /**
    * Perform static initialization of [world]. This should be run before
    * calling [HtmlDiff.run].
    */
   static void initialize() {
-    world.processDartScript('dart:htmlimpl');
+    world.processDartScript('dart:html');
     world.resolveAll();
     dom = world.libraries['dart:dom'];
   }
 
   HtmlDiff() :
     domToHtml = new Map<Member, Set<Member>>(),
     htmlToDom = new Map<Member, Set<Member>>(),
     domTypesToHtml = new Map<Type, Set<Type>>(),
     htmlTypesToDom = new Map<Type, Set<Type>>(),
     comments = new CommentMap();
 
   /**
    * Computes the `dart:dom` 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() {
-    final htmlLib = world.libraries['dart:htmlimpl'];
+    final htmlLib = world.libraries['dart:html'];
     for (var implType in htmlLib.types.getValues()) {
       final domTypes = htmlToDomTypes(implType);
       final htmlType = htmlImplToHtmlType(implType);
       if (htmlType == null) continue;
 
       htmlTypesToDom.putIfAbsent(htmlType, () => new Set()).addAll(domTypes);
       domTypes.forEach((t) =>
           domTypesToHtml.putIfAbsent(t, () => new Set()).add(htmlType));
 
       final members = new List.from(implType.members.getValues());
@@ skipping 20 matching lines @@
     var htmlName = htmlMember.name;
     if (htmlName.startsWith('get:') || htmlName.startsWith('set:')) {
       htmlName = htmlName.substring(4);
     }
 
     return domTypeName == htmlTypeName && domName == htmlName;
   }
 
   /**
    * Records the `dart:dom` to `dart:html` mapping for [implMember] (from
-   * `dart:htmlimpl`). [domTypes] are the `dart:dom` [Type]s that correspond to
+   * `dart:html`). [domTypes] are the `dart:dom` [Type]s that correspond to
    * [implMember]'s defining [Type].
    */
   void _addMemberDiff(Member implMember, List<Type> domTypes) {
     if (implMember.isProperty) {
       if (implMember.canGet) _addMemberDiff(implMember.getter, domTypes);
       if (implMember.canSet) _addMemberDiff(implMember.setter, domTypes);
     }
 
     var domMembers = htmlToDomMembers(implMember, domTypes);
     var htmlMember = htmlImplToHtmlMember(implMember);
     if (htmlMember == null && !domMembers.isEmpty()) {
-      print('Warning: dart:htmlimpl member ${implMember.declaringType.name}.' +
+      print('Warning: dart:html member ${implMember.declaringType.name}.' +
           '${implMember.name} has no corresponding dart:html member.');
     }
 
     if (htmlMember == null) return;
     if (!domMembers.isEmpty()) htmlToDom[htmlMember] = domMembers;
     domMembers.forEach((m) =>
         domToHtml.putIfAbsent(m, () => new Set()).add(htmlMember));
   }
 
   /**
    * Returns the `dart:html` [Type] that corresponds to [implType] from
-   * `dart:htmlimpl`, or `null` if there is no such correspondence.
+   * `dart:html`, or `null` if there is no such correspondence.
    */
   Type htmlImplToHtmlType(Type implType) {
     if (implType == null || implType.isTop || implType.interfaces.isEmpty() ||
         implType.interfaces[0].library.name != 'html') {
       return null;
     }
 
     return implType.interfaces[0];
   }
 
   /**
    * Returns the `dart:html` [Member] that corresponds to [implMember] from
-   * `dart:htmlimpl`, or `null` if there is no such correspondence.
+   * `dart:html`, or `null` if there is no such correspondence.
    */
   Member htmlImplToHtmlMember(Member implMember) {
     var htmlType = htmlImplToHtmlType(implMember.declaringType);
     if (htmlType == null) return null;
 
     bool getter, setter;
     if (implMember.isConstructor || implMember.isFactory) {
       var constructor = htmlType.constructors[implMember.name];
       if (constructor != null) return constructor;
 
       // Look for a factory constructor whose type and name matches the member.
       return htmlType.factories.getFactoriesFor(implMember.name)[
           implMember.constructorName];
     } else if ((getter = implMember.name.startsWith('get:')) ||
         (setter = implMember.name.startsWith('set:'))) {
       // Use getMember to follow interface inheritance chains.
       var htmlProperty = htmlType.getMember(implMember.name.substring(4));
       if (htmlProperty != null) {
         return getter ? htmlProperty.getter : htmlProperty.setter;
       } else {
         return null;
       }
     } else {
       return htmlType.getMember(implMember.name);
     }
   }
 
   /**
    * Returns the `dart:dom` [Type]s that correspond to [htmlType] from
-   * `dart:htmlimpl`. This can be the empty list if no correspondence is found.
+   * `dart:html`. This can be the empty list if no correspondence is found.
    */
   List<Type> htmlToDomTypes(Type htmlType) {
     if (htmlType.name == null) return [];
     final tags = _getTags(comments.find(htmlType.span));
 
     if (tags.containsKey('domName')) {
       var domNames = map(tags['domName'].split(','), (s) => s.trim());
       if (domNames.length == 1 && domNames[0] == 'none') return [];
       return map(domNames, (domName) {
         // DOMWindow is Chrome-specific, so we don't use it in our annotations.
         if (domName == 'Window') domName = 'DOMWindow';
         final domType = dom.types[domName];
         if (domType == null) print('Warning: no dart:dom type named $domName');
         return domType;
       });
     } else {
       if (!htmlType.name.endsWith('WrappingImplementation')) return [];
       final domName = htmlType.name.replaceFirst('WrappingImplementation', '');
       var domType = dom.types[domName];
       if (domType == null && domName.endsWith('Element')) {
         domType = dom.types['HTML$domName'];
       }
       if (domType == null) domType = dom.types['WebKit$domName'];
       if (domType == null) {
-        print('Warning: no dart:dom type matches dart:htmlimpl ' +
+        print('Warning: no dart:dom type matches dart:html ' +
             htmlType.name);
         return [];
       }
       return [domType];
     }
   }
 
   /**
    * Returns the `dart:dom` [Member]s that correspond to [htmlMember] from
-   * `dart:htmlimpl`. This can be the empty set if no correspondence is found.
+   * `dart:html`. This can be the empty set if no correspondence is found.
    * [domTypes] are the `dart:dom` [Type]s that correspond to [implMember]'s
    * defining [Type].
    */
   Set<Member> htmlToDomMembers(Member htmlMember, List<Type> domTypes) {
     if (htmlMember.isPrivate || htmlMember is! MethodMember) return new Set();
     final tags = _getTags(comments.find(htmlMember.span));
     if (tags.containsKey('domName')) {
       final domNames = map(tags['domName'].split(','), (s) => s.trim());
       if (domNames.length == 1 && domNames[0] == 'none') return new Set();
       final members = new Set();
@@ skipping 161 matching lines @@
   Map<String, String> _getTags(String comment) {
     if (comment == null) return const <String>{};
     final re = new RegExp("@([a-zA-Z]+) ([^;]+)(?:;|\$)");
     final tags = <String>{};
     for (var m in re.allMatches(comment.trim())) {
       tags[m[1]] = m[2];
     }
     return tags;
   }
 }