Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/src/fletch_compiler_implementation.dart

 // Copyright (c) 2015, the Fletch 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.md file.
 
 library fletchc.fletch_compiler_implementation;
 
 import 'dart:async' show
     EventSink;
 
 import 'package:sdk_library_metadata/libraries.dart' show
     LibraryInfo;
 
 import 'package:compiler/compiler_new.dart' as api;
 
-import 'package:compiler/src/apiimpl.dart' as apiimpl;
-
-import 'package:compiler/src/compiler.dart' show
-    GlobalDependencyRegistry;
+import 'package:compiler/src/apiimpl.dart' show
+    CompilerImpl;
 
 import 'package:compiler/src/io/source_file.dart';
 
 import 'package:compiler/src/source_file_provider.dart' show
     SourceFileProvider;
 
 import 'package:compiler/src/elements/modelx.dart' show
     CompilationUnitElementX,
     LibraryElementX;
 
 import 'package:compiler/compiler_new.dart' show
     CompilerOutput;
 
 import 'package:compiler/src/diagnostics/messages.dart' show
     Message,
     MessageKind,
     MessageTemplate;
+
 import 'package:compiler/src/diagnostics/source_span.dart' show
     SourceSpan;
 
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart' show
     DiagnosticMessage,
     DiagnosticReporter;
 
 import 'package:compiler/src/diagnostics/spannable.dart' show
     Spannable;
 
-import 'fletch_registry.dart' show
-    FletchRegistry;
-
 import 'please_report_crash.dart' show
     crashReportRequested,
     requestBugReportOnCompilerCrashMessage;
 
 import 'fletch_function_builder.dart';
 import 'debug_info.dart';
 import 'find_position_visitor.dart';
 import 'fletch_context.dart';
 
 import 'fletch_enqueuer.dart' show
     FletchEnqueueTask;
 
 import '../fletch_system.dart';
+
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
-import 'package:compiler/src/elements/elements.dart';
+
+import 'fletch_diagnostic_reporter.dart' show
+    FletchDiagnosticReporter;
 
 const EXTRA_DART2JS_OPTIONS = const <String>[
     // TODO(ahe): This doesn't completely disable type inference. Investigate.
     '--disable-type-inference',
     '--output-type=dart',
     // We want to continue generating code in the case of errors, to support
     // incremental fixes of erroneous code.
     '--generate-code-with-compile-time-errors',
 ];
 
@@ skipping 40 matching lines @@
       documented: false,
       platforms: FLETCH_PLATFORM),
 
   "fletch.os": const LibraryInfo(
       "os/os.dart",
       categories: "Client,Server,Embedded",
       documented: false,
       platforms: FLETCH_PLATFORM),
 };
 
-class FletchCompilerImplementation extends apiimpl.CompilerImpl {
+class FletchCompilerImplementation extends CompilerImpl {
   final Map<String, LibraryInfo> fletchLibraries = <String, LibraryInfo>{};
 
   final Uri fletchVm;
 
   /// Location of fletch patch files.
   final Uri patchRoot;
 
   final Uri nativesJson;
 
   Map<Uri, CompilationUnitElementX> compilationUnits;
   FletchContext internalContext;
 
   /// A reference to [../compiler.dart:FletchCompiler] used for testing.
   // TODO(ahe): Clean this up and remove this.
   var helper;
 
-  @override
   FletchEnqueueTask get enqueuer => super.enqueuer;
 
   FletchDiagnosticReporter reporter;
 
   FletchCompilerImplementation(
       api.CompilerInput provider,
       api.CompilerOutput outputProvider,
       api.CompilerDiagnostics handler,
       Uri libraryRoot,
       Uri packageConfig,
@@ skipping 13 matching lines @@
 
   FletchContext get context {
     if (internalContext == null) {
       internalContext = new FletchContext(this);
     }
     return internalContext;
   }
 
   String fletchPatchLibraryFor(String name) => FLETCH_PATCHES[name];
 
-  @override
   Uri lookupLibraryUri(String libraryName) {
     LibraryInfo info = FLETCH_LIBRARIES[libraryName];
     if (info == null) return super.lookupLibraryUri(libraryName);
     return patchRoot.resolve("lib/${info.path}");
   }
 
   Uri resolvePatchUri(String dartLibraryPath) {
     String patchPath = fletchPatchLibraryFor(dartLibraryPath);
     if (patchPath == null) return null;
     return patchRoot.resolve("lib/$patchPath");
@@ skipping 113 matching lines @@
   }
 }
 
 SourceFile getSourceFile(api.CompilerInput provider, Uri uri) {
   if (provider is SourceFileProvider) {
     return provider.sourceFiles[uri];
   } else {
     return null;
   }
 }
-
-/// A wrapper around a DiagnosticReporter, that customizes some messages to
-/// Fletch.
-class FletchDiagnosticReporter extends DiagnosticReporter {
-  DiagnosticReporter _internalReporter;
-
-  FletchDiagnosticReporter(this._internalReporter);
-
-  @override
-  DiagnosticMessage createMessage(Spannable spannable,
-      MessageKind messageKind,
-      [Map arguments = const {}]) {
-    return _internalReporter.createMessage(spannable, messageKind, arguments);
-  }
-
-  @override
-  internalError(Spannable spannable, message) {
-    return _internalReporter.internalError(spannable, message);
-  }
-
-  @override
-  void log(message) {
-    _internalReporter.log(message);
-  }
-
-  @override
-  DiagnosticOptions get options => _internalReporter.options;
-
-  @override
-  void reportError(DiagnosticMessage message,
-      [List<DiagnosticMessage> infos = const <DiagnosticMessage> []]) {
-    if (message.message.kind ==
-        MessageKind.MIRRORS_LIBRARY_NOT_SUPPORT_BY_BACKEND) {
-      const String noMirrors =
-          "Fletch doesn't support 'dart:mirrors'. See https://goo.gl/Kwrd0O";
-      message = createMessage(message.spannable,
-          MessageKind.GENERIC,
-          {'text': message});
-    }
-    _internalReporter.reportError(message, infos);
-  }
-
-  @override
-  void reportHint(DiagnosticMessage message,
-      [List<DiagnosticMessage> infos = const <DiagnosticMessage> []]) {
-    _internalReporter.reportHint(message, infos);
-  }
-
-  @override
-  void reportInfo(Spannable node,
-      MessageKind errorCode,
-      [Map arguments = const {}]) {
-    _internalReporter.reportInfo(node, errorCode, arguments);
-  }
-
-  @override
-  void reportWarning(DiagnosticMessage message,
-      [List<DiagnosticMessage> infos = const <DiagnosticMessage> []]) {
-    _internalReporter.reportWarning(message, infos);
-  }
-
-  @override
-  SourceSpan spanFromSpannable(Spannable node) {
-    return _internalReporter.spanFromSpannable(node);
-  }
-
-  @override
-  withCurrentElement(Element element, f()) {
-    return _internalReporter.withCurrentElement(element, f);
-  }
-}