Get apidoc working with latest frog.

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 39 matching lines @@
 
   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:html');
+    world.getOrAddLibrary('dart:dom');
+    world.getOrAddLibrary('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();
@@ skipping 82 matching lines @@
   }
 
   /**
    * Returns the `dart:html` [Member] that corresponds to [implMember] from
    * `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:'))) {
+    }
+
+    final getter = implMember.name.startsWith('get:');
+    final setter = implMember.name.startsWith('set:');
+
+    if (getter || setter) {
       // 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);
+
+      if (htmlProperty == null) return null;
+
+      // If it's a straight field, use that directly.
+      if (htmlProperty.isField) return htmlProperty;
+
+      // Otherwise, it's a property, so use the appropriate getter or setter.
+      return getter ? htmlProperty.getter : htmlProperty.setter;
     }
+
+    return htmlType.getMember(implMember.name);
   }
 
   /**
    * Returns the `dart:dom` [Type]s that correspond to [htmlType] from
    * `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));
 
@@ skipping 87 matching lines @@
         if (t.members.containsKey(name)) members.add(t.members[name]);
       });
       return members;
     }
 
     final splitName = name.split('.');
     if (splitName.length != 2) {
       print('Warning: invalid member name ${name}');
       return new Set();
     }
+
     var typeName = splitName[0];
     if (typeName == 'Window') typeName = 'DOMWindow';
+
     final type = dom.types[typeName];
     if (type == null) return new Set();
+
     final member = type.members[splitName[1]];
     if (member == null) return new Set();
+
     return new Set.from([member]);
   }
 
   /**
    * Returns the `dart:dom` [Member]s that are referred to in [stmt]. This only
    * extracts references from relatively simple statements; methods containing
    * more complex wrappers should be manually annotated with `@domName`.
    *
    * [domTypes] are the `dart:dom` [Type]s that correspond to the current
    * [Member]'s defining [Type].
@@ skipping 88 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;
   }
 }