Refactored accessors in mirrors from methods to properties.

lib/dartdoc/mirrors/dart2js_mirror.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.dart2js');
 
 #import('../../compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../compiler/implementation/elements/elements.dart');
 #import('../../compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../compiler/implementation/scanner/scannerlib.dart');
@@ skipping 340 matching lines @@
       // TODO(johnniwinther): Detect file not found
     }
     _compiler.runList(librariesUri);
   }
 
   void addLibrary(String path) {
     var uri = cwd.resolve(nativeToUriPath(path));
     _compiler.scanner.loadLibrary(uri, null);
   }
 
-  MirrorSystem mirrors() => new Dart2JsMirrorSystem(_compiler);
+  MirrorSystem get mirrors() => new Dart2JsMirrorSystem(_compiler);
 
   Future<String> compileToJavaScript() =>
       new Future<String>.immediate(_compiler.assembledCode);
 }
 
 
 //------------------------------------------------------------------------------
 // Dart2Js specific extensions of mirror interfaces
 //------------------------------------------------------------------------------
 
@@ skipping 15 matching lines @@
 
 abstract class Dart2JsElementMirror implements Dart2JsMirror {
   final Dart2JsMirrorSystem system;
   final Element _element;
 
   Dart2JsElementMirror(this.system, this._element) {
     assert (system !== null);
     assert (_element !== null);
   }
 
-  String simpleName() => _element.name.slowToString();
+  String get simpleName() => _element.name.slowToString();
 
-  Location location() => new Dart2JsLocation(
+  Location get location() => new Dart2JsLocation(
       _element.getCompilationUnit().script,
       system.compiler.spanFromElement(_element));
 
   String toString() => _element.toString();
 
-  int hashCode() => qualifiedName().hashCode();
+  int hashCode() => qualifiedName.hashCode();
 }
 
 abstract class Dart2JsProxyMirror implements Dart2JsMirror {
   final Dart2JsMirrorSystem system;
 
   Dart2JsProxyMirror(this.system);
 
-  int hashCode() => qualifiedName().hashCode();
+  int hashCode() => qualifiedName.hashCode();
 }
 
 //------------------------------------------------------------------------------
 // Mirror system implementation.
 //------------------------------------------------------------------------------
 
 class Dart2JsMirrorSystem implements MirrorSystem, Dart2JsMirror {
   final api.Compiler compiler;
   Map<String, Dart2JsLibraryMirror> _libraries;
   Map<LibraryElement, Dart2JsLibraryMirror> _libraryMap;
 
   Dart2JsMirrorSystem(this.compiler)
     : _libraryMap = new Map<LibraryElement, Dart2JsLibraryMirror>();
 
   void _ensureLibraries() {
     if (_libraries == null) {
       _libraries = <Dart2JsLibraryMirror>{};
       compiler.libraries.forEach((_, LibraryElement v) {
         var mirror = new Dart2JsLibraryMirror(system, v);
         _libraries[mirror.canonicalName] = mirror;
         _libraryMap[v] = mirror;
       });
     }
   }
 
-  Map<Object, LibraryMirror> libraries() {
+  Map<Object, LibraryMirror> get libraries() {
     _ensureLibraries();
     return new ImmutableMapWrapper<Object, LibraryMirror>(_libraries);
   }
 
   Dart2JsLibraryMirror getLibrary(LibraryElement element) {
     return _libraryMap[element];
   }
 
   Dart2JsMirrorSystem get system() => this;
 
-  String simpleName() => "mirror";
-  String qualifiedName() => simpleName();
+  String get simpleName() => "mirror";
+  String get qualifiedName() => simpleName;
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
   // TODO(johnniwinther): Hack! Dart2JsMirrorSystem need not be a Mirror.
-  int hashCode() => qualifiedName().hashCode();
+  int hashCode() => qualifiedName.hashCode();
 }
 
 abstract class Dart2JsObjectMirror extends Dart2JsElementMirror
     implements ObjectMirror {
   Dart2JsObjectMirror(Dart2JsMirrorSystem system, Element element)
       : super(system, element);
 }
 
 class Dart2JsLibraryMirror extends Dart2JsObjectMirror
     implements LibraryMirror {
   Map<String, InterfaceMirror> _types;
   Map<String, MemberMirror> _members;
 
   Dart2JsLibraryMirror(Dart2JsMirrorSystem system, LibraryElement library)
       : super(system, library);
 
   LibraryElement get _library() => _element;
 
   LibraryMirror library() => this;
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
   /**
    * Returns the library name (for libraries with a #library tag) or the script
    * file name (for scripts without a #library tag). The latter case is used to
    * provide a 'library name' for scripts, to use for instance in dartdoc.
    */
-  String simpleName() {
+  String get simpleName() {
     if (_library.libraryTag !== null) {
       return _library.libraryTag.argument.dartString.slowToString();
     } else {
       // Use the file name as script name.
       String path = _library.script.uri.path;
       return path.substring(path.lastIndexOf('/') + 1);
     }
   }
 
-  String qualifiedName() => simpleName();
+  String get qualifiedName() => simpleName;
 
   void _ensureTypes() {
     if (_types == null) {
       _types = <InterfaceMirror>{};
       _library.forEachExport((Element e) {
         if (e.getLibrary() == _library) {
           if (e.isClass()) {
             var type = new Dart2JsInterfaceMirror.fromLibrary(this, e);
             _types[type.canonicalName] = type;
           } else if (e.isTypedef()) {
@@ skipping 11 matching lines @@
       _library.forEachExport((Element e) {
         if (!e.isClass() && !e.isTypedef()) {
           for (var member in _convertElementMemberToMemberMirrors(this, e)) {
             _members[member.canonicalName] = member;
           }
         }
       });
     }
   }
 
-  Map<Object, MemberMirror> declaredMembers() {
+  Map<Object, MemberMirror> get declaredMembers() {
     _ensureMembers();
     return new ImmutableMapWrapper<Object, MemberMirror>(_members);
   }
 
-  Map<Object, InterfaceMirror> types() {
+  Map<Object, InterfaceMirror> get types() {
     _ensureTypes();
     return new ImmutableMapWrapper<Object, InterfaceMirror>(_types);
   }
 
-  Location location() {
+  Location get location() {
     var script = _library.getCompilationUnit().script;
     return new Dart2JsLocation(
         script,
         new SourceSpan(script.uri, 0, script.text.length));
   }
 }
 
 class Dart2JsLocation implements Location {
   Script _script;
   SourceSpan _span;
 
   Dart2JsLocation(this._script, this._span);
 
-  int start() => _span.begin;
-  int end() => _span.end;
-  Source source() => new Dart2JsSource(_script);
+  int get start() => _span.begin;
 
-  String text() => _script.text.substring(start(), end());
+  int get end() => _span.end;
+
+  Source get source() => new Dart2JsSource(_script);
+
+  String get text() => _script.text.substring(start, end);
 }
 
 class Dart2JsSource implements Source {
   Script _script;
 
   Dart2JsSource(this._script);
 
-  Uri uri() => _script.uri;
-  String text() => _script.text;
+  Uri get uri() => _script.uri;
+
+  String get text() => _script.text;
 }
 
 class Dart2JsParameterMirror extends Dart2JsElementMirror
     implements ParameterMirror {
   final MethodMirror _method;
   final bool _isOptional;
 
   factory Dart2JsParameterMirror(Dart2JsMirrorSystem system,
                                  MethodMirror method,
                                  VariableElement element,
                                  bool isOptional) {
     if (element is FieldParameterElement) {
       return new Dart2JsFieldParameterMirror(system,
                                              method, element, isOptional);
     }
     return new Dart2JsParameterMirror._normal(system,
                                               method, element, isOptional);
   }
 
   Dart2JsParameterMirror._normal(Dart2JsMirrorSystem system,
                          this._method,
                          VariableElement element,
                          this._isOptional)
     : super(system, element);
 
   VariableElement get _variableElement() => _element;
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
-  String qualifiedName() => '${_method.qualifiedName()}#${simpleName()}';
+  String get qualifiedName() => '${_method.qualifiedName}#${simpleName}';
 
-  TypeMirror type() => _convertTypeToTypeMirror(system,
+  TypeMirror get type() => _convertTypeToTypeMirror(system,
       _variableElement.computeType(system.compiler),
       system.compiler.dynamicClass.computeType(system.compiler),
       _variableElement.variables.functionSignature);
 
-  String defaultValue() {
-    if (hasDefaultValue()) {
+  String get defaultValue() {
+    if (hasDefaultValue) {
       SendSet expression = _variableElement.cachedNode.asSendSet();
       return expression.arguments.head.unparse();
     }
     return null;
   }
-  bool hasDefaultValue() {
+  bool get hasDefaultValue() {
     return _variableElement.cachedNode !== null &&
         _variableElement.cachedNode is SendSet;
   }
 
-  bool isOptional() => _isOptional;
+  bool get isOptional() => _isOptional;

[turnidge, 2012/08/09 17:44:13]

This could be made a final bool field instead of a getter.  Your call.

[Johnni Winther, 2012/08/10 23:40:23]

Done.

 
-  bool isInitializingFormal() => false;
+  bool get isInitializingFormal() => false;
 
-  FieldMirror initializedField() => null;
+  FieldMirror get initializedField() => null;
 }
 
 class Dart2JsFieldParameterMirror extends Dart2JsParameterMirror {
 
   Dart2JsFieldParameterMirror(Dart2JsMirrorSystem system,
                               MethodMirror method,
                               FieldParameterElement element,
                               bool isOptional)
       : super._normal(system, method, element, isOptional);
 
   FieldParameterElement get _fieldParameterElement() => _element;
 
-  TypeMirror type() {
+  TypeMirror get type() {
     if (_fieldParameterElement.variables.cachedNode.type !== null) {
-      return super.type();
+      return super.type;
     }
     return _convertTypeToTypeMirror(system,
       _fieldParameterElement.fieldElement.computeType(system.compiler),
       system.compiler.dynamicClass.computeType(system.compiler),
       _variableElement.variables.functionSignature);
   }
 
-  bool isInitializingFormal() => true;
+  bool get isInitializingFormal() => true;
 
-  FieldMirror initializedField() => new Dart2JsFieldMirror(
-      _method.surroundingDeclaration(), _fieldParameterElement.fieldElement);
+  FieldMirror get initializedField() => new Dart2JsFieldMirror(
+      _method.surroundingDeclaration, _fieldParameterElement.fieldElement);
 }
 
 //------------------------------------------------------------------------------
 // Declarations
 //------------------------------------------------------------------------------
 class Dart2JsInterfaceMirror extends Dart2JsObjectMirror
     implements Dart2JsTypeMirror, InterfaceMirror {
   final Dart2JsLibraryMirror _library;
   Map<String, Dart2JsMemberMirror> _members;
   List<TypeVariableMirror> _typeVariables;
 
   Dart2JsInterfaceMirror(Dart2JsMirrorSystem system, ClassElement _class)
       : this._library = system.getLibrary(_class.getLibrary()),
         super(system, _class);
 
   ClassElement get _class() => _element;
 
 
   Dart2JsInterfaceMirror.fromLibrary(Dart2JsLibraryMirror library,
                                  ClassElement _class)
       : this._library = library,
         super(library.system, _class);
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
-  String qualifiedName() => '${library().qualifiedName()}.${simpleName()}';
+  String get qualifiedName() => '${library.qualifiedName}.${simpleName}';
 
-  Location location() {
+  Location get location() {
     if (_class is PartialClassElement) {
       var node = _class.parseNode(_diagnosticListener);
       if (node !== null) {
         var script = _class.getCompilationUnit().script;
         var span = system.compiler.spanFromNode(node, script.uri);
         return new Dart2JsLocation(script, span);
       }
     }
-    return super.location();
+    return super.location;
   }
 
   void _ensureMembers() {
     if (_members == null) {
       _members = <Dart2JsMemberMirror>{};
       _class.constructors.forEach((_, e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           _members[member.canonicalName] = member;
         }
       });
       _class.localMembers.forEach((_, e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           _members[member.canonicalName] = member;
         }
       });
     }
   }
 
-  Map<Object, MemberMirror> declaredMembers() {
+  Map<Object, MemberMirror> get declaredMembers() {
     _ensureMembers();
     return new ImmutableMapWrapper<Object, MemberMirror>(_members);
   }
 
-  LibraryMirror library() {
+  LibraryMirror get library() {

[turnidge, 2012/08/09 17:44:13]

Ditto here.  You get the idea.  Again, your call.

[Johnni Winther, 2012/08/10 23:40:23]

Done.

     return _library;
   }
 
   bool get isObject() => _class == system.compiler.objectClass;
 
   bool get isDynamic() => _class == system.compiler.dynamicClass;
 
   bool get isVoid() => false;
 
   bool get isTypeVariable() => false;
 
   bool get isTypedef() => false;
 
   bool get isFunction() => false;
 
   InterfaceMirror get declaration() => this;
 
-  InterfaceMirror superclass() {
+  InterfaceMirror get superclass() {
     if (_class.supertype != null) {
       return new Dart2JsInterfaceTypeMirror(system, _class.supertype);
     }
     return null;
   }
 
-  Map<Object, InterfaceMirror> interfaces() {
+  Map<Object, InterfaceMirror> get interfaces() {
     var map = new Map<String, InterfaceMirror>();
     Link<Type> link = _class.interfaces;
     while (!link.isEmpty()) {
       var type = _convertTypeToTypeMirror(system, link.head,
           system.compiler.dynamicClass.computeType(system.compiler));
       map[type.canonicalName] = type;
       link = link.tail;
     }
     return new ImmutableMapWrapper<Object, InterfaceMirror>(map);
   }
 
   bool get isClass() => !_class.isInterface();
 
   bool get isInterface() => _class.isInterface();
 
-  bool get isPrivate() => _isPrivate(simpleName());
+  bool get isPrivate() => _isPrivate(simpleName);
 
   bool get isDeclaration() => true;
 
-  List<TypeMirror> typeArguments() {
+  List<TypeMirror> get typeArguments() {
     throw new UnsupportedOperationException(
         'Declarations do not have type arguments');
   }
 
-  List<TypeVariableMirror> typeVariables() {
+  List<TypeVariableMirror> get typeVariables() {
     if (_typeVariables == null) {
       _typeVariables = <TypeVariableMirror>[];
       _class.ensureResolved(system.compiler);
       for (TypeVariableType typeVariable in _class.typeVariables) {
         _typeVariables.add(
             new Dart2JsTypeVariableMirror(system, typeVariable));
       }
     }
     return _typeVariables;
   }
 
-  Map<Object, MethodMirror> constructors() {
+  Map<Object, MethodMirror> get constructors() {
     _ensureMembers();
     return new AsFilteredImmutableMap<Object, MemberMirror, MethodMirror>(
         _members, (m) => m.isConstructor ? m : null);
   }
 
   /**
    * Returns the default type for this interface.
    */
-  InterfaceMirror defaultType() {
+  InterfaceMirror get defaultType() {
     if (_class.defaultClass != null) {
       return new Dart2JsInterfaceTypeMirror(system, _class.defaultClass);
     }
     return null;
   }
 
   bool operator ==(Object other) {
     if (this === other) {
       return true;
     }
     if (other is! InterfaceMirror) {
       return false;
     }
-    if (library() != other.library()) {
+    if (library != other.library) {
       return false;
     }
     if (isDeclaration !== other.isDeclaration) {
       return false;
     }
-    return qualifiedName() == other.qualifiedName();
+    return qualifiedName == other.qualifiedName;
   }
 }
 
 class Dart2JsTypedefMirror extends Dart2JsElementMirror
     implements Dart2JsTypeMirror, TypedefMirror {
   final Dart2JsLibraryMirror _library;
   List<TypeVariableMirror> _typeVariables;
   TypeMirror _definition;
 
   Dart2JsTypedefMirror(Dart2JsMirrorSystem system, TypedefElement _typedef)
       : this._library = system.getLibrary(_typedef.getLibrary()),
         super(system, _typedef);
 
   Dart2JsTypedefMirror.fromLibrary(Dart2JsLibraryMirror library,
                                    TypedefElement _typedef)
       : this._library = library,
         super(library.system, _typedef);
 
   TypedefElement get _typedef() => _element;
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
-  String qualifiedName() => '${library().qualifiedName()}.${simpleName()}';
+  String get qualifiedName() => '${library.qualifiedName}.${simpleName}';
 
-  Location location() {
+  Location get location() {
     var node = _typedef.parseNode(_diagnosticListener);
     if (node !== null) {
       var script = _typedef.getCompilationUnit().script;
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     }
-    return super.location();
+    return super.location;
   }
 
-  LibraryMirror library() => _library;
+  LibraryMirror get library() => _library;
 
   bool get isObject() => false;
 
   bool get isDynamic() => false;
 
   bool get isVoid() => false;
 
   bool get isTypeVariable() => false;
 
   bool get isTypedef() => true;
 
   bool get isFunction() => false;
 
-  List<TypeMirror> typeArguments() {
+  List<TypeMirror> get typeArguments() {
     throw new UnsupportedOperationException(
         'Declarations do not have type arguments');
   }
 
-  List<TypeVariableMirror> typeVariables() {
+  List<TypeVariableMirror> get typeVariables() {
     if (_typeVariables == null) {
       _typeVariables = <TypeVariableMirror>[];
       // TODO(johnniwinther): Equip [Typedef] with a [typeParameters] map, just
       // like [ClassElement].
     }
     return _typeVariables;
   }
 
-  TypeMirror definition() {
+  TypeMirror get definition() {
     if (_definition === null) {
       // TODO(johnniwinther): Provide access to the functionSignature of the
       // aliased function definition.
     }
     return _definition;
   }
 
-  Map<Object, MemberMirror> declaredMembers() => const <MemberMirror>{};
+  Map<Object, MemberMirror> get declaredMembers() => const <MemberMirror>{};
 
   InterfaceMirror get declaration() => this;
 
   // TODO(johnniwinther): How should a typedef respond to these?
-  InterfaceMirror superclass() => null;
+  InterfaceMirror get superclass() => null;
 
-  Map<Object, InterfaceMirror> interfaces() => const <InterfaceMirror>{};
+  Map<Object, InterfaceMirror> get interfaces() => const <InterfaceMirror>{};
 
   bool get isClass() => false;
 
   bool get isInterface() => false;
 
-  bool get isPrivate() => _isPrivate(simpleName());
+  bool get isPrivate() => _isPrivate(simpleName);
 
   bool get isDeclaration() => true;
 
-  Map<Object, MethodMirror> constructors() => const <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() => const <MethodMirror>{};
 
-  InterfaceMirror defaultType() => null;
+  InterfaceMirror get defaultType() => null;
 }
 
 class Dart2JsTypeVariableMirror extends Dart2JsTypeElementMirror
     implements TypeVariableMirror {
   final TypeVariableType _typeVariableType;
   InterfaceMirror _declarer;
 
   Dart2JsTypeVariableMirror(Dart2JsMirrorSystem system,
                             TypeVariableType typeVariableType)
     : this._typeVariableType = typeVariableType,
       super(system, typeVariableType) {
       assert(_typeVariableType !== null);
   }
 
 
-  String qualifiedName() => '${declarer().qualifiedName()}.${simpleName()}';
+  String get qualifiedName() => '${declarer.qualifiedName}.${simpleName}';
 
-  InterfaceMirror declarer() {
+  InterfaceMirror get declarer() {
     if (_declarer === null) {
       if (_typeVariableType.element.enclosingElement.isClass()) {
         _declarer = new Dart2JsInterfaceMirror(system,
             _typeVariableType.element.enclosingElement);
       } else if (_typeVariableType.element.enclosingElement.isTypedef()) {
         _declarer = new Dart2JsTypedefMirror(system,
             _typeVariableType.element.enclosingElement);
       }
     }
     return _declarer;
   }
 
-  LibraryMirror library() => declarer().library();
+  LibraryMirror get library() => declarer.library;
 
   bool get isObject() => false;
 
   bool get isDynamic() => false;
 
   bool get isVoid() => false;
 
   bool get isTypeVariable() => true;
 
   bool get isTypedef() => false;
 
   bool get isFunction() => false;
 
-  TypeMirror bound() => _convertTypeToTypeMirror(
+  TypeMirror get bound() => _convertTypeToTypeMirror(
       system,
       _typeVariableType.element.bound,
       system.compiler.objectClass.computeType(system.compiler));
 
   bool operator ==(Object other) {
     if (this === other) {
       return true;
     }
     if (other is! TypeVariableMirror) {
       return false;
     }
-    if (declarer() != other.declarer()) {
+    if (declarer != other.declarer) {
       return false;
     }
-    return qualifiedName() == other.qualifiedName();
+    return qualifiedName == other.qualifiedName;
   }
 }
 
 
 //------------------------------------------------------------------------------
 // Types
 //------------------------------------------------------------------------------
 
 abstract class Dart2JsTypeElementMirror extends Dart2JsProxyMirror
     implements Dart2JsTypeMirror {
   final Type _type;
 
   Dart2JsTypeElementMirror(Dart2JsMirrorSystem system, this._type)
     : super(system);
 
-  String simpleName() => _type.name.slowToString();
+  String get simpleName() => _type.name.slowToString();
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
-  Location location() {
+  Location get location() {
     var script = _type.element.getCompilationUnit().script;
     return new Dart2JsLocation(script,
                                system.compiler.spanFromElement(_type.element));
   }
 
-  LibraryMirror library() {
+  LibraryMirror get library() {
     return system.getLibrary(_type.element.getLibrary());
   }
 
   String toString() => _type.element.toString();
 }
 
 class Dart2JsInterfaceTypeMirror extends Dart2JsTypeElementMirror
     implements InterfaceMirror {
   List<TypeMirror> _typeArguments;
 
   Dart2JsInterfaceTypeMirror(Dart2JsMirrorSystem system,
                              InterfaceType interfaceType)
       : super(system, interfaceType);
 
   InterfaceType get _interfaceType() => _type;
 
-  String qualifiedName() => declaration.qualifiedName();
+  String get qualifiedName() => declaration.qualifiedName;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<Object, MemberMirror> declaredMembers() => declaration.declaredMembers();
+  Map<Object, MemberMirror> get declaredMembers() => declaration.declaredMembers;
 
   bool get isObject() => system.compiler.objectClass == _type.element;
 
   bool get isDynamic() => system.compiler.dynamicClass == _type.element;
 
   bool get isTypeVariable() => false;
 
   bool get isVoid() => false;
 
   bool get isTypedef() => false;
 
   bool get isFunction() => false;
 
   InterfaceMirror get declaration()
       => new Dart2JsInterfaceMirror(system, _type.element);
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  InterfaceMirror superclass() => declaration.superclass();
+  InterfaceMirror get superclass() => declaration.superclass;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<Object, InterfaceMirror> interfaces() => declaration.interfaces();
+  Map<Object, InterfaceMirror> get interfaces() => declaration.interfaces;
 
   bool get isClass() => declaration.isClass;
 
   bool get isInterface() => declaration.isInterface;
 
   bool get isPrivate() => declaration.isPrivate;
 
   bool get isDeclaration() => false;
 
-  List<TypeMirror> typeArguments() {
+  List<TypeMirror> get typeArguments() {
     if (_typeArguments == null) {
       _typeArguments = <TypeMirror>[];
       Link<Type> type = _interfaceType.arguments;
       while (type != null && type.head != null) {
         _typeArguments.add(_convertTypeToTypeMirror(system, type.head,
             system.compiler.dynamicClass.computeType(system.compiler)));
         type = type.tail;
       }
     }
     return _typeArguments;
   }
 
-  List<TypeVariableMirror> typeVariables() => declaration.typeVariables();
+  List<TypeVariableMirror> get typeVariables() => declaration.typeVariables;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<Object, MethodMirror> constructors() => declaration.constructors();
+  Map<Object, MethodMirror> get constructors() => declaration.constructors;
 
   // TODO(johnniwinther): Substitute type arguments for type variables?
-  InterfaceMirror defaultType() => declaration.defaultType();
+  InterfaceMirror get defaultType() => declaration.defaultType;
 
   bool operator ==(Object other) {
     if (this === other) {
       return true;
     }
     if (other is! InterfaceMirror) {
       return false;
     }
     if (other.isDeclaration) {
       return false;
     }
     if (declaration != other.declaration) {
       return false;
     }
-    var thisTypeArguments = typeArguments().iterator();
-    var otherTypeArguments = other.typeArguments().iterator();
+    var thisTypeArguments = typeArguments.iterator();
+    var otherTypeArguments = other.typeArguments.iterator();
     while (thisTypeArguments.hasNext() && otherTypeArguments.hasNext()) {
       if (thisTypeArguments.next() != otherTypeArguments.next()) {
         return false;
       }
     }
     return !thisTypeArguments.hasNext() && !otherTypeArguments.hasNext();
   }
 }
 
 
 class Dart2JsFunctionTypeMirror extends Dart2JsTypeElementMirror
     implements FunctionTypeMirror {
   final FunctionSignature _functionSignature;
   List<ParameterMirror> _parameters;
 
   Dart2JsFunctionTypeMirror(Dart2JsMirrorSystem system,
                              FunctionType functionType, this._functionSignature)
       : super(system, functionType) {
     assert (_functionSignature !== null);
   }
 
   FunctionType get _functionType() => _type;
 
   // TODO(johnniwinther): Is this the qualified name of a function type?
-  String qualifiedName() => declaration.qualifiedName();
+  String get qualifiedName() => declaration.qualifiedName;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<Object, MemberMirror> declaredMembers() {
-    var method = callMethod();
+  Map<Object, MemberMirror> get declaredMembers() {
+    var method = callMethod;
     if (method !== null) {
       var map = new Map<String, MemberMirror>.from(
-          declaration.declaredMembers());
-      var name = method.qualifiedName();
+          declaration.declaredMembers);
+      var name = method.qualifiedName;
       map[name] = method;
       Function func = null;
       return new ImmutableMapWrapper<Object, MemberMirror>(map);
     }
-    return declaration.declaredMembers();
+    return declaration.declaredMembers;
   }
 
   bool get isObject() => system.compiler.objectClass == _type.element;
 
   bool get isDynamic() => system.compiler.dynamicClass == _type.element;
 
   bool get isVoid() => false;
 
   bool get isTypeVariable() => false;
 
   bool get isTypedef() => false;
 
   bool get isFunction() => true;
 
-  MethodMirror callMethod() => _convertElementMethodToMethodMirror(
+  MethodMirror get callMethod() => _convertElementMethodToMethodMirror(
       system.getLibrary(_functionType.element.getLibrary()),
       _functionType.element);
 
   InterfaceMirror get declaration()
       => new Dart2JsInterfaceMirror(system, system.compiler.functionClass);
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  InterfaceMirror superclass() => declaration.superclass();
+  InterfaceMirror get superclass() => declaration.superclass;
 
   // TODO(johnniwinther): Substitute type arguments for type variables.
-  Map<Object, InterfaceMirror> interfaces() => declaration.interfaces();
+  Map<Object, InterfaceMirror> get interfaces() => declaration.interfaces;
 
   bool get isClass() => declaration.isClass;
 
   bool get isInterface() => declaration.isInterface;
 
   bool get isPrivate() => declaration.isPrivate;
 
   bool get isDeclaration() => false;
 
-  List<TypeMirror> typeArguments() => const <TypeMirror>[];
+  List<TypeMirror> get typeArguments() => const <TypeMirror>[];
 
-  List<TypeVariableMirror> typeVariables() => declaration.typeVariables();
+  List<TypeVariableMirror> get typeVariables() => declaration.typeVariables;
 
-  Map<Object, MethodMirror> constructors() => <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() => <MethodMirror>{};
 
-  InterfaceMirror defaultType() => null;
+  InterfaceMirror get defaultType() => null;
 
-  TypeMirror returnType() {
+  TypeMirror get returnType() {
     return _convertTypeToTypeMirror(system, _functionType.returnType,
         system.compiler.dynamicClass.computeType(system.compiler));
   }
 
-  List<ParameterMirror> parameters() {
+  List<ParameterMirror> get parameters() {
     if (_parameters === null) {
-      _parameters = _parametersFromFunctionSignature(system, callMethod(),
+      _parameters = _parametersFromFunctionSignature(system, callMethod,
                                                      _functionSignature);
     }
     return _parameters;
   }
 }
 
 class Dart2JsVoidMirror extends Dart2JsTypeElementMirror {
 
   Dart2JsVoidMirror(Dart2JsMirrorSystem system, VoidType voidType)
       : super(system, voidType);
 
   VoidType get _voidType() => _type;
 
-  String qualifiedName() => simpleName();
+  String get qualifiedName() => simpleName;
 
   /**
    * The void type has no location.
    */
-  Location location() => null;
+  Location get location() => null;
 
   /**
    * The void type has no library.
    */
-  LibraryMirror getLibrary() => null;
+  LibraryMirror get library() => null;
 
   bool get isObject() => false;
 
   bool get isVoid() => true;
 
   bool get isDynamic() => false;
 
   bool get isTypeVariable() => false;
 
   bool get isTypedef() => false;
@@ skipping 75 matching lines @@
       _canonicalName = _name;
     } else if (kind == Dart2JsMethodKind.SETTER) {
       _canonicalName = '$_name=';
     } else {
       assert(false);
     }
   }
 
   FunctionElement get _function() => _element;
 
-  String simpleName() => _name;
+  String get simpleName() => _name;
 
-  String qualifiedName()
-      => '${surroundingDeclaration().qualifiedName()}.$canonicalName';
+  String get qualifiedName()
+      => '${surroundingDeclaration.qualifiedName}.$canonicalName';
 
   String get canonicalName() => _canonicalName;
 
-  ObjectMirror surroundingDeclaration() => _objectMirror;
+  ObjectMirror get surroundingDeclaration() => _objectMirror;
 
   bool get isTopLevel() => _objectMirror is LibraryMirror;
 
   bool get isConstructor()
       => _kind == Dart2JsMethodKind.CONSTRUCTOR || isConst || isFactory;
 
   bool get isField() => false;
 
   bool get isMethod() => !isConstructor;
 
-  bool get isPrivate() => _isPrivate(simpleName());
+  bool get isPrivate() => _isPrivate(simpleName);
 
   bool get isStatic() =>
       _function.modifiers !== null && _function.modifiers.isStatic();
 
-  List<ParameterMirror> parameters() {
+  List<ParameterMirror> get parameters() {
     return _parametersFromFunctionSignature(system, this,
         _function.computeSignature(system.compiler));
   }
 
-  TypeMirror returnType() => _convertTypeToTypeMirror(
+  TypeMirror get returnType() => _convertTypeToTypeMirror(
       system, _function.computeSignature(system.compiler).returnType,
       system.compiler.dynamicClass.computeType(system.compiler));
 
   bool get isConst() => _kind == Dart2JsMethodKind.CONST;
 
   bool get isFactory() => _kind == Dart2JsMethodKind.FACTORY;
 
   String get constructorName() => _constructorName;
 
   bool get isGetter() => _kind == Dart2JsMethodKind.GETTER;
 
   bool get isSetter() => _kind == Dart2JsMethodKind.SETTER;
 
   bool get isOperator() => _kind == Dart2JsMethodKind.OPERATOR;
 
   String get operatorName() => _operatorName;
 
-  Location location() {
+  Location get location() {
     var node = _function.parseNode(_diagnosticListener);
     if (node !== null) {
       var script = _function.getCompilationUnit().script;
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     }
-    return super.location();
+    return super.location;
   }
 
 }
 
 class Dart2JsFieldMirror extends Dart2JsElementMirror
     implements Dart2JsMemberMirror, FieldMirror {
   Dart2JsObjectMirror _objectMirror;
   VariableElement _variable;
 
   Dart2JsFieldMirror(Dart2JsObjectMirror objectMirror,
                      VariableElement variable)
       : this._objectMirror = objectMirror,
         this._variable = variable,
         super(objectMirror.system, variable);
 
-  String qualifiedName()
-      => '${surroundingDeclaration().qualifiedName()}.$canonicalName';
+  String get qualifiedName()
+      => '${surroundingDeclaration.qualifiedName}.$canonicalName';
 
-  String get canonicalName() => simpleName();
+  String get canonicalName() => simpleName;
 
-  ObjectMirror surroundingDeclaration() => _objectMirror;
+  ObjectMirror get surroundingDeclaration() => _objectMirror;
 
   bool get isTopLevel() => _objectMirror is LibraryMirror;
 
   bool get isConstructor() => false;
 
   bool get isField() => true;
 
   bool get isMethod() => false;
 
-  bool get isPrivate() => _isPrivate(simpleName());
+  bool get isPrivate() => _isPrivate(simpleName);
 
   bool get isStatic() => _variable.modifiers.isStatic();
 
   bool get isFinal() => _variable.modifiers.isFinal();
 
-  TypeMirror type() => _convertTypeToTypeMirror(system,
+  TypeMirror get type() => _convertTypeToTypeMirror(system,
       _variable.computeType(system.compiler),
       system.compiler.dynamicClass.computeType(system.compiler));
 
-  Location location() {
+  Location get location() {
     var script = _variable.getCompilationUnit().script;
     var node = _variable.variables.parseNode(_diagnosticListener);
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }