TypeVariableMirror and TypedefMirror updated.

pkg/dartdoc/lib/dartdoc.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.
 
 /**
  * To generate docs for a library, run this script with the path to an
  * entrypoint .dart file, like:
  *
  *     $ dart dartdoc.dart foo.dart
  *
@@ skipping 963 matching lines @@
     if (type is! TypedefMirror) {
       return;
     }
     writeln('<div class="method"><h4 id="${type.simpleName}">');
 
     if (includeSource) {
       writeln('<button class="show-code">Code</button>');
     }
 
     write('typedef ');
-    annotateType(type, type.definition, type.simpleName);
+    annotateType(type, type.value, type.simpleName);
 
     write(''' <a class="anchor-link" href="#${type.simpleName}"
               title="Permalink to ${type.simpleName}">#</a>''');
     writeln('</h4>');
 
     writeln('<div class="doc">');
     docCode(type.location);
     writeln('</div>');
 
     writeln('</div>');
@@ skipping 657 matching lines @@
     if (type is TypeVariableMirror) {
       return type.simpleName;
     }
     assert(type is ClassMirror);
 
     // See if it's a generic type.
     if (type.isOriginalDeclaration) {
       final typeParams = [];
       for (final typeParam in type.originalDeclaration.typeVariables) {
         if (showBounds &&
-            (typeParam.bound != null) &&
-            !typeParam.bound.isObject) {
-          final bound = typeName(typeParam.bound, showBounds: true);
+            (typeParam.upperBound != null) &&
+            !typeParam.upperBound.isObject) {
+          final bound = typeName(typeParam.upperBound, showBounds: true);
           typeParams.add('${typeParam.simpleName} extends $bound');
         } else {
           typeParams.add(typeParam.simpleName);
         }
       }
       if (typeParams.isEmpty) {
         return type.simpleName;
       }
       final params = Strings.join(typeParams, ', ');
       return '${type.simpleName}&lt;$params&gt;';
@@ skipping 182 matching lines @@
   final ClassMirror inheritedFrom;
 
   DocComment(this.text, [this.inheritedFrom = null]) {
     assert(text != null && !text.trim().isEmpty);
   }
 
   String get html => md.markdownToHtml(text);
 
   String toString() => text;
 }