- Reverting mirror changes.

tests/lib/mirrors/parameter_test.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.
 
 // This tests uses the multi-test "ok" feature:
 // none: Desired behaviour, passing on the VM.
 // 01: Trimmed version for dart2js.
 //
 // TODO(rmacnak,ahe): Remove multi-test when VM and dart2js are on par.
 
@@ skipping 27 matching lines @@
 }
 
 class C <S extends int, T> {
   // TODO(6490): Currently only supported by the VM.
   foo(int a, S b) => b;
   bar(S a, T b, num c) {}
 }
 
 main() {
   ClassMirror cm = reflectClass(B);
-  var constructors = new Map<Symbol, MethodMirror>();
-  cm.declarations.forEach((k, v) {
-    if (v is MethodMirror && v.isConstructor) constructors[k] = v;
-  });
+  Map<Symbol, MethodMirror> constructors = cm.constructors;
 
   List<Symbol> constructorKeys =
       [#B, #B.bar, #B.baz, #B.foo, #B.quux, #B.qux, #B.corge];
   Expect.setEquals(constructorKeys, constructors.keys);
 
   MethodMirror unnamedConstructor = constructors[#B];
   expect('Method(s(B) in s(B), constructor)', unnamedConstructor);
   expect('[]', unnamedConstructor.parameters);
   expect('Class(s(B) in s(test.parameter_test), top-level)',
          unnamedConstructor.returnType);
@@ skipping 58 matching lines @@
   expect('[Parameter(s(x) in s(B.corge), optional, named,'
          ' value = Instance(value = 51),'
          ' type = Class(s(int) in s(dart.core), top-level)), '
          'Parameter(s(str) in s(B.corge), optional, named,'
          ' value = Instance(value = bar),'
          ' type = Class(s(String) in s(dart.core), top-level))]',
          corgeConstructor.parameters);
   expect('Class(s(B) in s(test.parameter_test), top-level)',
          corgeConstructor.returnType);
 
-  MethodMirror xGetter = cm.declarations[#x];
+  MethodMirror xGetter = cm.getters[#x];
   expect('Method(s(x) in s(B), getter)', xGetter);
   expect('[]', xGetter.parameters);
 
-  MethodMirror xSetter = cm.declarations[const Symbol('x=')];
+  MethodMirror xSetter = cm.setters[const Symbol('x=')];
   expect('Method(s(x=) in s(B), setter)', xSetter);
   expect('[Parameter(s(value) in s(x=), final,'
          ' type = Type(s(dynamic), top-level))]',
          xSetter.parameters);
 
-  MethodMirror grault = cm.declarations[#grault];
+  MethodMirror grault = cm.members[#grault];
   expect('Method(s(grault) in s(B))', grault);
   expect('[Parameter(s(x) in s(grault), optional,'
          ' type = Class(s(int) in s(dart.core), top-level))]',
          grault.parameters);
   expect('Instance(value = <null>)', grault.parameters[0].defaultValue);
 
-  MethodMirror garply = cm.declarations[#garply];
+  MethodMirror garply = cm.members[#garply];
   expect('Method(s(garply) in s(B))', garply);
   expect('[Parameter(s(y) in s(garply), optional, named,'
          ' type = Class(s(int) in s(dart.core), top-level))]',
          garply.parameters);
   expect('Instance(value = <null>)', garply.parameters[0].defaultValue);
 
-  MethodMirror waldo = cm.declarations[#waldo];
+  MethodMirror waldo = cm.members[#waldo];
   expect('Method(s(waldo) in s(B))', waldo);
   expect('[Parameter(s(z) in s(waldo),' 
          ' type = Class(s(int) in s(dart.core), top-level))]',
          waldo.parameters);
   expect('<null>', waldo.parameters[0].defaultValue);
 
   cm = reflectClass(C);
 
-  MethodMirror fooInC = cm.declarations[#foo];
+  MethodMirror fooInC = cm.members[#foo];
   expect('Method(s(foo) in s(C))', fooInC);
   expect('[Parameter(s(a) in s(foo),'
          ' type = Class(s(int) in s(dart.core), top-level)), '
          'Parameter(s(b) in s(foo),'
          ' type = TypeVariable(s(S) in s(C),'
          ' upperBound = Class(s(int) in s(dart.core), top-level)))]',
          fooInC.parameters);
 
-  MethodMirror barInC = cm.declarations[#bar];
+  MethodMirror barInC = cm.members[#bar];
   expect('Method(s(bar) in s(C))', barInC);
   expect('[Parameter(s(a) in s(bar),'
          ' type = TypeVariable(s(S) in s(C),'
          ' upperBound = Class(s(int) in s(dart.core), top-level))), '
          'Parameter(s(b) in s(bar),'
          ' type = TypeVariable(s(T) in s(C),'
          ' upperBound = Class(s(Object) in s(dart.core), top-level))), '
          'Parameter(s(c) in s(bar),'
          ' type = Class(s(num) in s(dart.core), top-level))]',
          barInC.parameters);
 }