Extend the immutable collections test to the new API. Make *Members return immutable collections. A…

runtime/lib/mirrors_impl.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.
 
 // VM-specific implementation of the dart:mirrors library.
 
 import "dart:collection";
 
 final emptyList = new UnmodifiableListView([]);
 final emptyMap = new _UnmodifiableMapView({});
@@ skipping 204 matching lines @@
 
   bool get isOptional => false;
   bool get isNamed => false;
   bool get isStatic => false;
   bool get isTopLevel => false;
   bool get isConst => false;
   bool get isFinal => true;
   bool get isPrivate => false;
   bool get hasDefaultValue => false;
   InstanceMirror get defaultValue => null;
+  List<InstanceMirror> get metadata => emptyList;
 }
 
 abstract class _LocalObjectMirror extends _LocalMirror implements ObjectMirror {
   final _reflectee; // May be a MirrorReference or an ordinary object.
 
   _LocalObjectMirror(this._reflectee);
 
   InstanceMirror invoke(Symbol memberName,
                         List positionalArguments,
                         [Map<Symbol, dynamic> namedArguments]) {
@@ skipping 339 matching lines @@
           var getterName = decl.simpleName;
           result[getterName] =
               new _SyntheticAccessor(this, getterName, true, true, false, decl);
           if (!decl.isFinal) {
             var setterName = _asSetter(decl.simpleName, this.owner);
             result[setterName] = new _SyntheticAccessor(
                 this, setterName, false, true, false, decl);
           }
         }
       });
-      _cachedStaticMembers = result;
+      _cachedStaticMembers =
+          new _UnmodifiableMapView<Symbol, MethodMirror>(result);
     }
     return _cachedStaticMembers;
   }
 
   var _cachedInstanceMembers;
   Map<Symbol, MethodMirror> get instanceMembers {
     if (_cachedInstanceMembers == null) {
       var result = new Map<Symbol, MethodMirror>();
       if (superclass != null) {
         result.addAll(superclass.instanceMembers);
       }
       declarations.values.forEach((decl) {
         if (decl is MethodMirror && !decl.isStatic &&
             !decl.isConstructor && !decl.isAbstract) {
           result[decl.simpleName] = decl;
         }
         if (decl is VariableMirror && !decl.isStatic) {
           var getterName = decl.simpleName;
           result[getterName] =
               new _SyntheticAccessor(this, getterName, true, false, false, decl);
           if (!decl.isFinal) {
             var setterName = _asSetter(decl.simpleName, this.owner);
             result[setterName] = new _SyntheticAccessor(
                 this, setterName, false, false, false, decl);
           }
         }
       });
-      _cachedInstanceMembers = result;
+      _cachedInstanceMembers =
+          new _UnmodifiableMapView<Symbol, MethodMirror>(result);
     }
     return _cachedInstanceMembers;
   }
 
   Map<Symbol, DeclarationMirror> _declarations;
   Map<Symbol, DeclarationMirror> get declarations {
     if (_declarations != null) return _declarations;
     var decls = new Map<Symbol, DeclarationMirror>();
     decls.addAll(_members);
     decls.addAll(_constructors);
@@ skipping 450 matching lines @@
   Map<Symbol, DeclarationMirror> _declarations;
   Map<Symbol, DeclarationMirror> get declarations {
     if (_declarations != null) return _declarations;
     return _declarations =
         new _UnmodifiableMapView<Symbol, DeclarationMirror>(_members);
   }
 
 
   var _cachedTopLevelMembers;
   Map<Symbol, MethodMirror> get topLevelMembers {
-    if (_cachedTopLevelMembers != null) return _cachedTopLevelMembers;
-    var result = new Map<Symbol, MethodMirror>();
-    declarations.values.forEach((decl) {
-      if (decl is MethodMirror && !decl.isAbstract) {
-        result[decl.simpleName] = decl;
-      }
-      if (decl is VariableMirror) {
-        var getterName = decl.simpleName;
-        result[getterName] =
-            new _SyntheticAccessor(this, getterName, true, true, true, decl);
-        if (!decl.isFinal) {
-          var setterName = _asSetter(decl.simpleName, this);
-          result[setterName] = new _SyntheticAccessor(
-              this, setterName, false, true, true, decl);
+    if (_cachedTopLevelMembers == null) {
+      var result = new Map<Symbol, MethodMirror>();
+      declarations.values.forEach((decl) {
+        if (decl is MethodMirror && !decl.isAbstract) {
+          result[decl.simpleName] = decl;
         }
-      }
-      // if (decl is TypeMirror) {
-      //  var getterName = decl.simpleName;
-      //  result[getterName] = new _SyntheticTypeGetter(this, getterName, decl);
-      // }
-    });
-    return _cachedTopLevelMembers = result;
+        if (decl is VariableMirror) {
+          var getterName = decl.simpleName;
+          result[getterName] =
+              new _SyntheticAccessor(this, getterName, true, true, true, decl);
+          if (!decl.isFinal) {
+            var setterName = _asSetter(decl.simpleName, this);
+            result[setterName] = new _SyntheticAccessor(
+                this, setterName, false, true, true, decl);
+          }
+        }
+        // if (decl is TypeMirror) {
+        //  var getterName = decl.simpleName;
+        //  result[getterName] =
+        //      new _SyntheticTypeGetter(this, getterName, decl);
+        // }

[siva, 2014/01/09 19:29:49]

Why are we carrying this commented out code?

Maybe you should add a comment here explaining why the code needs to be
commented out, also I am not sure about the style guide here, would be
preferable to use
/**
 * Reason for commenting out.
 ....
 ....
 */

[rmacnak, 2014/01/09 20:38:07]

This was for behavior that wasn't agreed to. I'll just take it out.

+      });
+      _cachedTopLevelMembers =
+          new _UnmodifiableMapView<Symbol, MethodMirror>(result);
+    }
+    return _cachedTopLevelMembers;
   }
 
 
   Map<Symbol, Mirror> _cachedMembers;
   Map<Symbol, Mirror> get _members {
     if (_cachedMembers == null) {
       _cachedMembers = _makeMemberMap(_computeMembers(_reflectee));
     }
     return _cachedMembers;
   }
@@ skipping 373 matching lines @@
     if (typeMirror == null) {
       typeMirror = makeLocalTypeMirror(key);
       _instanitationCache[key] = typeMirror;
       if (typeMirror is ClassMirror && !typeMirror._isGeneric) {
         _declarationCache[key] = typeMirror;
       }
     }
     return typeMirror;
   }
 }