Merge SourceLocation and Source

pkg/dartdoc/lib/mirrors_util.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.
 
 library mirrors_util;
 
 // TODO(rnystrom): Use "package:" URL (#4968).
 import 'mirrors.dart';
-import '../../../lib/compiler/implementation/util/characters.dart';
 
 //------------------------------------------------------------------------------
 // Utility functions for using the Mirror API
 //------------------------------------------------------------------------------
 
 /**
  * Returns an iterable over the type declarations directly inheriting from
  * the declaration of this type.
  */
 Iterable<ClassMirror> computeSubdeclarations(ClassMirror type) {
@@ skipping 18 matching lines @@
             subtypes.add(otherType);
           }
         }
       }
     }
   });
   return subtypes;
 }
 
 LibraryMirror findLibrary(MemberMirror member) {
-  ContainerMirror owner = member.owner;
+  DeclarationMirror owner = member.owner;
   if (owner is LibraryMirror) {
     return owner;
   } else if (owner is TypeMirror) {
     return owner.library;
   }
   throw new Exception('Unexpected owner: ${owner}');
 }
 
-
-/**
- * Returns the column of the start of a location.
- */
-int getLocationColumn(SourceLocation location) {
-  String text = location.source.text;
-  int index = location.start-1;
-  var column = 0;
-  while (0 <= index && index < text.length) {
-    var charCode = text.charCodeAt(index);
-    if (charCode == $CR || charCode == $LF) {
-      break;
-    }
-    index--;
-    column++;
-  }
-  return column;
-}
-
 class HierarchyIterable implements Iterable<ClassMirror> {
   final bool includeType;
   final ClassMirror type;
 
   HierarchyIterable(this.type, {bool includeType})
       : this.includeType = includeType;
 
   Iterator<ClassMirror> iterator() =>
       new HierarchyIterator(type, includeType: includeType);
 }
@@ skipping 40 matching lines @@
       type = object;
       object = null;
       return type;
     } else {
       return push(queue.removeFirst());
     }
   }
 
   bool get hasNext => !queue.isEmpty || object != null;
 }