Extract DiagnosticReporter implementation from Compiler.

pkg/compiler/lib/src/mirrors/dart2js_mirrors.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 dart2js.mirrors;
 
 import 'dart:collection' show UnmodifiableListView, UnmodifiableMapView;
 
 import '../compiler.dart' show
     Compiler;
@@ skipping 117 matching lines @@
       var members = <Dart2JsMemberMirror>[];
       AbstractFieldElement field = element;
       if (field.getter != null) {
         members.add(new Dart2JsMethodMirror(this, field.getter));
       }
       if (field.setter != null) {
         members.add(new Dart2JsMethodMirror(this, field.setter));
       }
       return members;
     }
-    mirrorSystem.compiler.internalError(element,
+    mirrorSystem.compiler.reporter.internalError(element,
         "Unexpected member type $element ${element.kind}.");
     return null;
   }
 }
 
 abstract class Dart2JsElementMirror extends Dart2JsDeclarationMirror {
   final Dart2JsMirrorSystem mirrorSystem;
   final Element _element;
   List<InstanceMirror> _metadata;
 
@@ skipping 52 matching lines @@
   Script getScript() => _element.compilationUnit.script;
 
   SourceLocation get location {
     Token beginToken = getFirstToken();
     Script script = getScript();
     SourceSpan span;
     if (beginToken == null) {
       span = new SourceSpan(script.resourceUri, 0, 0);
     } else {
       Token endToken = getEndToken();
-      span = mirrorSystem.compiler.spanFromTokens(
-          beginToken, endToken, script.resourceUri);
+      span = new SourceSpan.fromTokens(
+          script.resourceUri, beginToken, endToken);
     }
     return new Dart2JsSourceLocation(script, span);
   }
 
   String toString() => _element.toString();
 
   void _appendCommentTokens(Token commentToken) {
     while (commentToken != null && commentToken.kind == Tokens.COMMENT_TOKEN) {
       _metadata.add(new Dart2JsCommentInstanceMirror(
           mirrorSystem, commentToken.value));
@@ skipping 118 matching lines @@
       return new Dart2JsFunctionTypeMirror(this, type);
     } else if (type is VoidType) {
       return new Dart2JsVoidMirror(this, type);
     } else if (type is TypedefType) {
       if (type.typeArguments.isEmpty) {
         return _getTypeDeclarationMirror(type.element);
       } else {
         return new Dart2JsTypedefMirror(this, type);
       }
     }
-    compiler.internalError(type.element,
+    compiler.reporter.internalError(type.element,
         "Unexpected type $type of kind ${type.kind}.");
     return null;
   }
 
   DeclarationMirror _getTypeDeclarationMirror(TypeDeclarationElement element) {
     if (element.isClass) {
       return new Dart2JsClassDeclarationMirror(this, element.thisType);
     } else if (element.isTypedef) {
       return new Dart2JsTypedefDeclarationMirror(this, element.thisType);
     }
-    compiler.internalError(element, "Unexpected element $element.");
+    compiler.reporter.internalError(element, "Unexpected element $element.");
     return null;
   }
 }
 
 abstract class ContainerMixin {
   UnmodifiableMapView<Symbol, DeclarationMirror> _declarations;
 
   void _ensureDeclarations() {
     if (_declarations == null) {
       var declarations = <Symbol, DeclarationMirror>{};
@@ skipping 113 matching lines @@
     if (!parameter.hasDefaultValue) return null;
     ParameterElement parameterElement = parameter._element;
     Compiler compiler = parameter.mirrorSystem.compiler;
     return compiler.constants.getConstantForVariable(parameterElement);
   }
 
   static Mirror getMirrorFromElement(Dart2JsMirror mirror, Element element) {
     return _convertElementToDeclarationMirror(mirror.mirrorSystem, element);
   }
 }