FieldMirror => VariableMirror

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 1017 matching lines @@
       if (!showPrivate && member.isPrivate) return;
       if (host is LibraryMirror || member.isStatic) {
         if (member is MethodMirror) {
           if (member.isGetter) {
             staticGetters[member.displayName] = member;
           } else if (member.isSetter) {
             staticSetters[member.displayName] = member;
           } else {
             staticMethods.add(member);
           }
-        } else if (member is FieldMirror) {
+        } else if (member is VariableMirror) {
           staticGetters[member.displayName] = member;
         }
       }
     });
 
     if (host is ClassMirror) {
       var iterable = new HierarchyIterable(host, includeType: true);
       for (ClassMirror type in iterable) {
         if (!host.isObject && !inheritFromObject && type.isObject) continue;
 
@@ skipping 46 matching lines @@
           instanceOperators.add(member);
           if (member.owner == host) {
             allOperatorsInherited = false;
           }
         } else {
           instanceMethods.add(member);
           if (member.owner == host) {
             allMethodsInherited = false;
           }
         }
-      } else if (member is FieldMirror) {
+      } else if (member is VariableMirror) {
         instanceGetters[member.displayName] = member;
         if (member.owner == host) {
           allPropertiesInherited = false;
         }
       }
     });
 
     instanceOperators.sort((MethodMirror a, MethodMirror b) {
       return operatorOrderMap[a.simpleName].compareTo(
           operatorOrderMap[b.simpleName]);
@@ skipping 31 matching lines @@
     nameList.sort((String a, String b) {
       return a.toLowerCase().compareTo(b.toLowerCase());
     });
 
     writeln('<div${allInherited ? ' class="inherited"' : ''}>');
     writeln('<h3>$title</h3>');
     for (String name in nameList) {
       MemberMirror getter = getters[name];
       MemberMirror setter = setters[name];
       if (setter == null) {
-        if (getter is FieldMirror) {
+        if (getter is VariableMirror) {
           // We have a field.
           docField(host, getter);
         } else {
           // We only have a getter.
           assert(getter is MethodMirror);
           docProperty(host, getter, null);
         }
       } else if (getter == null) {
         // We only have a setter => Document as a method.
         assert(setter is MethodMirror);
         docMethod(host, setter);
       } else {
         DocComment getterComment = getMemberComment(getter);
         DocComment setterComment = getMemberComment(setter);
         if (getter.owner !== setter.owner ||
             getterComment != null && setterComment != null) {
           // Both have comments or are not declared in the same class
           // => Documents separately.
-          if (getter is FieldMirror) {
+          if (getter is VariableMirror) {
             // Document field as a getter (setter is inherited).
             docField(host, getter, asGetter: true);
           } else {
             docMethod(host, getter);
           }
-          if (setter is FieldMirror) {
+          if (setter is VariableMirror) {
             // Document field as a setter (getter is inherited).
             docField(host, setter, asSetter: true);
           } else {
             docMethod(host, setter);
           }
         } else {
           // Document as field.
           docProperty(host, getter, setter);
         }
       }
@@ skipping 19 matching lines @@
    * [FieldMirror] it is documented as a getter or setter depending upon the
    * value of [asGetter].
    */
   void docMethod(ObjectMirror host, MemberMirror member,
                  {bool asGetter: false}) {
     _totalMembers++;
     _currentMember = member;
 
     bool isAbstract = false;
     String name = member.displayName;
-    if (member is FieldMirror) {
+    if (member is VariableMirror) {
       if (asGetter) {
         // Getter.
         name = 'get $name';
       } else {
         // Setter.
         name = 'set $name';
       }
     } else {
       assert(member is MethodMirror);
       isAbstract = member.isAbstract;
@@ skipping 24 matching lines @@
           write(member.isConst ? 'const ' : 'new ');
         }
       } else if (member.isAbstract) {
         write('abstract ');
       }
 
       if (!member.isConstructor) {
         annotateType(host, member.returnType);
       }
     } else {
-      assert(member is FieldMirror);
+      assert(member is VariableMirror);
       if (asGetter) {
         annotateType(host, member.type);
       } else {
         write('void ');
       }
     }
 
     write('<strong>$name</strong>');
 
     if (member is MethodMirror) {
       if (!member.isGetter) {
         docParamList(host, member.parameters);
       }
     } else {
-      assert(member is FieldMirror);
+      assert(member is VariableMirror);
       if (!asGetter) {
         write('(');
         annotateType(host, member.type);
         write(' value)');
       }
     }
 
     var prefix = host is LibraryMirror ? '' : '${typeName(host)}.';
     write(''' <a class="anchor-link" href="#${memberAnchor(member)}"
               title="Permalink to $prefix$name">#</a>''');
     writeln('</h4>');
 
     if (inherited) {
       write('<div class="inherited-from">inherited from ');
       annotateType(host, member.owner);
       write('</div>');
     }
 
     writeln('<div class="doc">');
     docComment(host, getMemberComment(member));
     if (showCode) {
       docCode(member.location);
     }
     writeln('</div>');
 
     writeln('</div>');
   }
 
-  void docField(ObjectMirror host, FieldMirror field,
+  void docField(ObjectMirror host, VariableMirror field,
                 {bool asGetter: false, bool asSetter: false}) {
     if (asGetter) {
       docMethod(host, field, asGetter: true);
     } else if (asSetter) {
       docMethod(host, field, asGetter: false);
     } else {
       docProperty(host, field, null);
     }
   }
 
@@ skipping 14 matching lines @@
     writeln('<div class="field${inherited ? ' inherited' : ''}">'
             '<h4 id="${memberAnchor(getter)}">');
 
     if (includeSource) {
       writeln('<button class="show-code">Code</button>');
     }
 
     bool isConst = false;
     bool isFinal;
     TypeMirror type;
-    if (getter is FieldMirror) {
+    if (getter is VariableMirror) {
       assert(setter == null);
       isConst = getter.isConst;
       isFinal = getter.isFinal;
       type = getter.type;
     } else {
       assert(getter is MethodMirror);
       isFinal = setter == null;
       type = getter.returnType;
     }
 
@@ skipping 500 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;
 }