Require two type arguments for map literals (issue 4522).

pkg/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('../../../lib/compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../../lib/compiler/implementation/elements/elements.dart');
 #import('../../../lib/compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../../lib/compiler/implementation/scanner/scannerlib.dart');
@@ skipping 299 matching lines @@
       throw message;
     } else if (fatal) {
       SourceFile file = sourceFiles[uri.toString()];
       print(file.getLocationMessage(message, begin, end, true, (s) => s));
       throw message;
     }
   }
 
   Dart2JsCompilation(Path script, Path libraryRoot,
                      [Path packageRoot, List<String> opts = const <String>[]])
-      : cwd = getCurrentDirectory(), sourceFiles = <SourceFile>{} {
+      : cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
     var libraryUri = cwd.resolve(libraryRoot.toString());
     var packageUri;
     if (packageRoot !== null) {
       packageUri = cwd.resolve(packageRoot.toString());
     } else {
       packageUri = libraryUri;
     }
     _compiler = new api.Compiler(provider, handler,
         libraryUri, packageUri, <String>[]);
     var scriptUri = cwd.resolve(script.toString());
     // TODO(johnniwinther): Detect file not found
     _compiler.run(scriptUri);
   }
 
   Dart2JsCompilation.library(List<Path> libraries, Path libraryRoot,
                      [Path packageRoot, List<String> opts = const <String>[]])
-      : cwd = getCurrentDirectory(), sourceFiles = <SourceFile>{} {
+      : cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
     var libraryUri = cwd.resolve(libraryRoot.toString());
     var packageUri;
     if (packageRoot !== null) {
       packageUri = cwd.resolve(packageRoot.toString());
     } else {
       packageUri = libraryUri;
     }
     _compiler = new LibraryCompiler(provider, handler,
         libraryUri, packageUri, <String>[]);
     var librariesUri = <Uri>[];
@@ skipping 71 matching lines @@
 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>{};
+      _libraries = <String, Dart2JsLibraryMirror>{};
       compiler.libraries.forEach((_, LibraryElement v) {
         var mirror = new Dart2JsLibraryMirror(system, v);
         _libraries[mirror.canonicalName] = mirror;
         _libraryMap[v] = mirror;
       });
     }
   }
 
   Map<Object, LibraryMirror> get libraries() {
     _ensureLibraries();
@@ skipping 47 matching lines @@
       // Use the file name as script name.
       String path = _library.uri.path;
       return path.substring(path.lastIndexOf('/') + 1);
     }
   }
 
   String get qualifiedName() => simpleName;
 
   void _ensureTypes() {
     if (_types == null) {
-      _types = <InterfaceMirror>{};
+      _types = <String, InterfaceMirror>{};
       _library.forEachExport((Element e) {
         if (e.getLibrary() == _library) {
           if (e.isClass()) {
             e.ensureResolved(system.compiler);
             var type = new Dart2JsInterfaceMirror.fromLibrary(this, e);
             _types[type.canonicalName] = type;
           } else if (e.isTypedef()) {
             var type = new Dart2JsTypedefMirror.fromLibrary(this, e);
             _types[type.canonicalName] = type;
           }
         }
       });
     }
   }
 
   void _ensureMembers() {
     if (_members == null) {
-      _members = <MemberMirror>{};
+      _members = <String, MemberMirror>{};
       _library.forEachExport((Element e) {
         if (!e.isClass() && !e.isTypedef()) {
           for (var member in _convertElementMemberToMemberMirrors(this, e)) {
             _members[member.canonicalName] = member;
           }
         }
       });
     }
   }
 
@@ skipping 149 matching lines @@
         var script = _class.getCompilationUnit().script;
         var span = system.compiler.spanFromNode(node, script.uri);
         return new Dart2JsLocation(script, span);
       }
     }
     return super.location;
   }
 
   void _ensureMembers() {
     if (_members == null) {
-      _members = <Dart2JsMemberMirror>{};
+      _members = <String, Dart2JsMemberMirror>{};
       _class.localMembers.forEach((e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           _members[member.canonicalName] = member;
         }
       });
     }
   }
 
   Map<Object, MemberMirror> get declaredMembers() {
     _ensureMembers();
@@ skipping 151 matching lines @@
   }
 
   TypeMirror get definition() {
     if (_definition === null) {
       // TODO(johnniwinther): Provide access to the functionSignature of the
       // aliased function definition.
     }
     return _definition;
   }
 
-  Map<Object, MemberMirror> get declaredMembers() => const <MemberMirror>{};
+  Map<Object, MemberMirror> get declaredMembers() =>
+      const <String, MemberMirror>{};
 
   InterfaceMirror get declaration() => this;
 
   // TODO(johnniwinther): How should a typedef respond to these?
   InterfaceMirror get superclass() => null;
 
-  Map<Object, InterfaceMirror> get interfaces() => const <InterfaceMirror>{};
+  Map<Object, InterfaceMirror> get interfaces() =>
+      const <String, InterfaceMirror>{};
 
   bool get isClass() => false;
 
   bool get isInterface() => false;
 
   bool get isPrivate() => _isPrivate(simpleName);
 
   bool get isDeclaration() => true;
 
-  Map<Object, MethodMirror> get constructors() => const <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() =>
+      const <String, MethodMirror>{};
 
   InterfaceMirror get defaultType() => null;
 }
 
 class Dart2JsTypeVariableMirror extends Dart2JsTypeElementMirror
     implements TypeVariableMirror {
   final TypeVariableType _typeVariableType;
   InterfaceMirror _declarer;
 
   Dart2JsTypeVariableMirror(Dart2JsMirrorSystem system,
@@ skipping 231 matching lines @@
   bool get isInterface() => declaration.isInterface;
 
   bool get isPrivate() => declaration.isPrivate;
 
   bool get isDeclaration() => false;
 
   List<TypeMirror> get typeArguments() => const <TypeMirror>[];
 
   List<TypeVariableMirror> get typeVariables() => declaration.typeVariables;
 
-  Map<Object, MethodMirror> get constructors() => <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() =>
+      <String, MethodMirror>{};
 
   InterfaceMirror get defaultType() => null;
 
   TypeMirror get returnType() {
     return _convertTypeToTypeMirror(system, _functionType.returnType,
         system.compiler.dynamicClass.computeType(system.compiler));
   }
 
   List<ParameterMirror> get parameters() {
     if (_parameters === null) {
@@ skipping 217 matching lines @@
     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);
     }
   }
 }