Mirrors overhaul.

dart/sdk/lib/_internal/lib/js_mirrors.dart

 // Copyright (c) 2013, 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 dart._js_mirrors;
 
 import 'dart:async';
 import 'dart:collection' show UnmodifiableListView;
 import 'dart:mirrors';
 
@@ skipping 58 matching lines @@
     Map<Uri, LibraryMirror> result = new Map();
     for (List<LibraryMirror> list in librariesByName.values) {
       for (LibraryMirror library in list) {
         result[library.uri] = library;
       }
     }
     return _cachedLibraries =
         new UnmodifiableMapView<Uri, LibraryMirror>(result);
   }
 
-  Iterable<LibraryMirror> findLibrary(Symbol libraryName) {
-    return new UnmodifiableListView<LibraryMirror>(
-        librariesByName[n(libraryName)]);
+  LibraryMirror findLibrary(Symbol libraryName) {
+    return librariesByName[n(libraryName)].single;
   }
 
   static Map<String, List<LibraryMirror>> computeLibrariesByName() {
     disableTreeShaking();
     var result = new Map<String, List<LibraryMirror>>();
     var jsLibraries = JS('JSExtendableArray|Null', 'init.libraries');
     if (jsLibraries == null) return result;
     for (List data in jsLibraries) {
       String name = data[0];
       Uri uri = Uri.parse(data[1]);
@@ skipping 530 matching lines @@
   Symbol get simpleName {
     if (_cachedSimpleName != null) return _cachedSimpleName;
     String superName = n(superclass.qualifiedName);
     return _cachedSimpleName = (superName.contains(' with '))
         ? s('$superName, ${n(mixin.qualifiedName)}')
         : s('$superName with ${n(mixin.qualifiedName)}');
   }
 
   Symbol get qualifiedName => simpleName;
 
-  Map<Symbol, Mirror> get members => mixin.members;
+  // TODO(ahe): Remove this method, only here to silence warning.
+  get _mixin => mixin;
 
-  Map<Symbol, MethodMirror> get methods => mixin.methods;
+  Map<Symbol, Mirror> get members => _mixin.members;
 
-  Map<Symbol, MethodMirror> get getters => mixin.getters;
+  Map<Symbol, MethodMirror> get methods => _mixin.methods;
 
-  Map<Symbol, MethodMirror> get setters => mixin.setters;
+  Map<Symbol, MethodMirror> get getters => _mixin.getters;
 
-  Map<Symbol, VariableMirror> get variables => mixin.variables;
+  Map<Symbol, MethodMirror> get setters => _mixin.setters;
+
+  Map<Symbol, VariableMirror> get variables => _mixin.variables;
+
+  Map<Symbol, DeclarationMirror> get declarations => mixin.declarations;
 
   InstanceMirror invoke(
       Symbol memberName,
       List positionalArguments,
       [Map<Symbol,dynamic> namedArguments]) {
     // TODO(ahe): What receiver to use?
     throw new NoSuchMethodError(this, memberName,
                                 positionalArguments, namedArguments);
   }
 
   InstanceMirror getField(Symbol fieldName) {
     // TODO(ahe): What receiver to use?
     throw new NoSuchMethodError(this, fieldName, null, null);
   }
 
   InstanceMirror setField(Symbol fieldName, Object arg) {
     // TODO(ahe): What receiver to use?
     throw new NoSuchMethodError(this, setterSymbol(fieldName), [arg], null);
   }
 
   List<ClassMirror> get superinterfaces => [mixin];
 
-  Map<Symbol, MethodMirror> get constructors => mixin.constructors;
+  Map<Symbol, MethodMirror> get constructors => _mixin.constructors;
 
   InstanceMirror newInstance(
       Symbol constructorName,
       List positionalArguments,
       [Map<Symbol,dynamic> namedArguments]) {
     throw new UnsupportedError(
         "Can't instantiate mixin application '${n(qualifiedName)}'");
   }
 
   Future<InstanceMirror> newInstanceAsync(
@@ skipping 1432 matching lines @@
 
 // TODO(ahe): Remove this class and call noSuchMethod instead.
 class UnimplementedNoSuchMethodError extends Error
     implements NoSuchMethodError {
   final String _message;
 
   UnimplementedNoSuchMethodError(this._message);
 
   String toString() => "Unsupported operation: $_message";
 }