Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/fletch_compiler.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;
 
 import 'dart:async' show
     Future;
 
 import 'dart:convert' show
@@ skipping 16 matching lines @@
 
 import 'package:compiler/src/filenames.dart' show
     appendSlash;
 
 import 'src/fletch_native_descriptor.dart' show
     FletchNativeDescriptor;
 
 import 'src/fletch_backend.dart' show
     FletchBackend;
 
 import 'package:compiler/src/apiimpl.dart' as apiimpl;

[ahe, 2015/12/01 10:12:12]

I'd change this to:

import 'package:compiler/src/apiimpl.dart' show
    CompilerImpl;

[sigurdm, 2015/12/03 14:48:09]

Done.

 
 import 'src/fletch_compiler_implementation.dart' show
     FletchCompilerImplementation,
     OutputProvider;
 
 import 'fletch_system.dart';
 
 import 'incremental/fletchc_incremental.dart' show
     IncrementalCompiler,
     IncrementalMode;
@@ skipping 67 matching lines @@
             return "Client";
           case Category.server:
             return "Server";
           case Category.embedded:
             return "Embedded";
         }
       }).join(",");
       options.add("--categories=$categoriesOptionValue");
     }
 
-    final bool isVerbose = apiimpl.Compiler.hasOption(options, '--verbose');
+    final bool isVerbose = apiimpl.CompilerImpl.hasOption(options, '--verbose');
 
     if (provider == null) {
       provider = new CompilerSourceFileProvider()
           ..cwd = base;
     }
 
     if (handler == null) {
       SourceFileProvider sourceFileProvider = null;
       if (provider is SourceFileProvider) {
         sourceFileProvider = provider;
       }
       handler = new FormattingDiagnosticHandler(sourceFileProvider)
           ..throwOnError = false
           ..verbose = isVerbose;
     }
 
     if (outputProvider == null) {
       outputProvider = new OutputProvider();
     }
 
-    if (libraryRoot == null  && _LIBRARY_ROOT != null) {
+    if (libraryRoot == null && _LIBRARY_ROOT != null) {
       libraryRoot = executable.resolve(appendSlash(_LIBRARY_ROOT));
     }
     libraryRoot = _computeValidatedUri(
         libraryRoot, name: 'libraryRoot', ensureTrailingSlash: true,
         base: base);
     if (libraryRoot == null) {
       libraryRoot = _guessLibraryRoot();
       if (libraryRoot == null) {
         throw new StateError("""
 Unable to guess the location of the Dart SDK (libraryRoot).
@@ skipping 12 matching lines @@
       if (script != null) {
         packageConfig = script.resolve('.packages');
       } else {
         packageConfig = base.resolve('.packages');
       }
     }
 
     fletchVm = guessFletchVm(
         _computeValidatedUri(fletchVm, name: 'fletchVm', base: base));
 
-    if (patchRoot == null  && _PATCH_ROOT != null) {
+    if (patchRoot == null && _PATCH_ROOT != null) {
       patchRoot = executable.resolve(appendSlash(_PATCH_ROOT));
     }
     patchRoot = _computeValidatedUri(
         patchRoot, name: 'patchRoot', ensureTrailingSlash: true, base: base);
     if (patchRoot == null) {
       patchRoot = _guessPatchRoot(libraryRoot);
       if (patchRoot == null) {
         throw new StateError("""
 Unable to guess the location of the fletch patch files (patchRoot).
 Try adding command-line option '-Dfletch-patch-root=<path to fletch patch>.""");
       }
     } else if (!_looksLikePatchRoot(patchRoot)) {
       throw new ArgumentError(
           "[patchRoot]: Fletch patches not found in '$patchRoot'.");
     }
 
     if (environment == null) {
       environment = <String, dynamic>{};
     }
 
-    if (nativesJson == null  && _NATIVES_JSON != null) {
+    if (nativesJson == null && _NATIVES_JSON != null) {
       nativesJson = base.resolve(_NATIVES_JSON);
     }
     nativesJson = _computeValidatedUri(
         nativesJson, name: 'nativesJson', base: base);
 
     if (nativesJson == null) {
       nativesJson = _guessNativesJson();
       if (nativesJson == null) {
         throw new StateError(
 """
@@ skipping 56 matching lines @@
     _compiler.context.nativeDescriptors = natives;
     _compiler.context.setNames(names);
   }
 
   Uri get fletchVm => _compiler.fletchVm;
 
   /// Create a new instance of [IncrementalCompiler].
   IncrementalCompiler newIncrementalCompiler(
       IncrementalMode support,
       {List<String> options: const <String>[]}) {
+    // TODO(sigurdm): Remove this hack.
+    Uri correctedLibraryRoot = _compiler.libraryRoot.resolve("..");
     return new IncrementalCompiler(
-        libraryRoot: _compiler.libraryRoot,
+        libraryRoot: correctedLibraryRoot,
         patchRoot: _compiler.patchRoot,
         packageConfig: _compiler.packageConfig,
         fletchVm: _compiler.fletchVm,
         nativesJson: _compiler.nativesJson,
         inputProvider: _compiler.provider,
         diagnosticHandler: _compiler.handler,
         options: options,
         outputProvider: _compiler.userOutputProvider,
         environment: _compiler.environment,
         categories: categories,
@@ skipping 95 matching lines @@
 }
 
 bool _looksLikeNativesJson(Uri uri) {
   return new File.fromUri(uri).existsSync();
 }
 
 Uri _guessNativesJson() {
   Uri uri = executable.resolve('natives.json');
   return _looksLikeNativesJson(uri) ? uri : null;
 }