Catergorized classes to abstract, class, typedef, and error/exception

[email protected]

Review URL: https://codereview.chromium.org//19708003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@25160 260f80e4-7a28-3924-810f-c04153c831b5

Author: janicejl

pkg/docgen/lib/docgen.dart

@@ -344,38 +344,61 @@ Map<String, Map<String, Method>> _getMethods
       } else if (mirror.isRegularMethod) {
          methods[mirrorName] = method;
       } else {
-        throw new StateError('${mirror.qualifiedName} - no method type match');
+        throw new ArgumentError('$mirrorName - no method type match');
       }
     }
   });
-  return {'setters' : setters,
-          'getters' : getters,
-          'constructors' : constructors,
-          'operators' : operators,
-          'methods' : methods};
+  return {
+    'setters': setters,
+    'getters': getters,
+    'constructors': constructors,
+    'operators': operators,
+    'methods': methods
+  };
 } 
 
 /**
  * Returns a map of [Class] objects constructed from inputted mirrors.
  */
 Map<String, Class> _getClasses(Map<String, ClassMirror> mirrorMap,
     bool includePrivate) {
-  var data = {};
+  
+  var abstract = {};
+  var classes = {};
+  var typedefs = {};
+  var errors = {};
+  
   mirrorMap.forEach((String mirrorName, ClassMirror mirror) {
     if (includePrivate || !mirror.isPrivate) {
-      _currentClass = mirror;
       var superclass = (mirror.superclass != null) ?
           mirror.superclass.qualifiedName : '';
       var interfaces =
           mirror.superinterfaces.map((interface) => interface.qualifiedName);
-      data[mirrorName] = new Class(mirrorName, superclass, mirror.isAbstract, 
-          mirror.isTypedef, _getComment(mirror), interfaces.toList(),
-          _getVariables(mirror.variables, includePrivate),
+      var clazz = new Class(mirrorName, superclass, _getComment(mirror), 
+          interfaces.toList(), _getVariables(mirror.variables, includePrivate),
           _getMethods(mirror.methods, includePrivate),
           _getAnnotations(mirror), mirror.qualifiedName);
+      _currentClass = mirror;
+      
+      if (isError(mirror.qualifiedName)) {
+        errors[mirrorName] = clazz;
+      } else if (mirror.isTypedef) {
+        typedefs[mirrorName] = clazz;
+      } else if (mirror.isAbstract) {
+        abstract[mirrorName] = clazz;
+      } else if (mirror.isClass) {
+        classes[mirrorName] = clazz;
+      } else {
+        throw new ArgumentError('$mirrorName - no class style match. ');
+      }
     }
   });
-  return data;
+  return {
+    'abstract': abstract, 
+    'class': classes,
+    'typedef': typedefs,
+    'error': errors
+  };
 }
 
 /**
@@ -424,6 +447,11 @@ Map recurseMap(Map inputMap) {
   return outputMap;
 }
 
+bool isError(String qualifiedName) {
+  return qualifiedName.toLowerCase().contains('error') || 
+      qualifiedName.toLowerCase().contains('exception');
+}
+
 /**
  * A class representing all programming constructs, like library or class. 
  */
@@ -489,24 +517,20 @@ class Class extends Indexable {
 
   String name;
   String superclass;
-  bool isAbstract;
-  bool isTypedef;
 
   /// List of the meta annotations on the class.
   List<String> annotations;
 
-  Class(this.name, this.superclass, this.isAbstract, this.isTypedef, 
-      this.comment, this.interfaces, this.variables, this.methods, 
-      this.annotations, String qualifiedName) : super(qualifiedName) {}
+  Class(this.name, this.superclass, this.comment, this.interfaces, 
+      this.variables, this.methods, this.annotations, 
+      String qualifiedName) : super(qualifiedName) {}
 
   /// Generates a map describing the [Class] object.
   Map toMap() {
     var classMap = {};
     classMap['name'] = name;
     classMap['comment'] = comment;
     classMap['superclass'] = superclass;
-    classMap['abstract'] = isAbstract.toString();
-    classMap['typedef'] = isTypedef.toString();
     classMap['implements'] = new List.from(interfaces);
     classMap['variables'] = recurseMap(variables);
     classMap['methods'] = recurseMap(methods);

pkg/docgen/test/single_library_test.dart

@@ -54,7 +54,11 @@ main() {
               includePrivate: true);
           expect(library is Library, isTrue);
 
-          var classes = library.classes.values;
+          var classTypes = library.classes.values;
+          expect(classTypes.every((e) => e is Map), isTrue);
+          
+          var classes = [];
+          classTypes.forEach((e) => classes.addAll(e.values));
           expect(classes.every((e) => e is Class), isTrue);
 
           var classMethodTypes = [];