Repeats and fixes the changes landed & reverted as CL 1789553003.

pkg/compiler/lib/src/compiler.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.compiler_base;
 
 import 'dart:async' show
     EventSink,
     Future;
 
@@ skipping 32 matching lines @@
     CoreTypes;
 import 'dart_backend/dart_backend.dart' as dart_backend;
 import 'dart_types.dart' show
     DartType,
     DynamicType,
     InterfaceType,
     Types;
 import 'deferred_load.dart' show DeferredLoadTask, OutputUnit;
 import 'diagnostics/code_location.dart';
 import 'diagnostics/diagnostic_listener.dart' show
-    DiagnosticOptions;
+    DiagnosticReporter;
 import 'diagnostics/invariant.dart' show
     REPORT_EXCESS_RESOLUTION;
 import 'diagnostics/messages.dart' show
     Message,
     MessageTemplate;
 import 'dump_info.dart' show
     DumpInfoTask;
 import 'elements/elements.dart';
 import 'elements/modelx.dart' show
     ErroneousElementX,
@@ skipping 24 matching lines @@
     LibraryLoaderListener,
     ResolvedUriTranslator,
     ScriptLoader;
 import 'mirrors_used.dart' show
     MirrorUsageAnalyzerTask;
 import 'common/names.dart' show
     Selectors;
 import 'null_compiler_output.dart' show
     NullCompilerOutput,
     NullSink;
+import 'options.dart' show
+    CompilerOptions,
+    DiagnosticOptions,
+    ParserOptions;
 import 'parser/diet_parser_task.dart' show
     DietParserTask;
 import 'parser/element_listener.dart' show
     ScannerOptions;
 import 'parser/parser_task.dart' show
     ParserTask;
 import 'patch_parser.dart' show
     PatchParserTask;
 import 'resolution/registry.dart' show
     ResolutionRegistry;
@@ skipping 76 matching lines @@
    * Dependencies that are only included due to mirrors.
    *
    * We should get rid of this and ensure that all dependencies are
    * associated with a particular element.
    */
   // TODO(johnniwinther): This should not be a [ResolutionRegistry].
   final Registry mirrorDependencies =
       new ResolutionRegistry(null, new TreeElementMapping(null));
 
   /// Options provided from command-line arguments.
-  final api.CompilerOptions options;
+  final CompilerOptions options;
 
   /**
    * If true, stop compilation after type inference is complete. Used for
    * debugging and testing purposes only.
    */
   bool stopAfterTypeInference = false;
 
   /// Output provider from user of Compiler API.
   api.CompilerOutput userOutputProvider;
 
@@ skipping 144 matching lines @@
 
   bool get compilationFailed => compilationFailedInternal;
 
   void set compilationFailed(bool value) {
     if (value) {
       elementsWithCompileTimeErrors.add(currentElement);
     }
     compilationFailedInternal = value;
   }
 
-  Compiler({api.CompilerOptions options,
+  Compiler({CompilerOptions options,
             api.CompilerOutput outputProvider,
             this.environment: const _EmptyEnvironment()})
       : this.options = options,
         this.cacheStrategy = new CacheStrategy(options.hasIncrementalSupport),
         this.userOutputProvider = outputProvider == null
             ? const NullCompilerOutput() : outputProvider {
-
     world = new World(this);
     // TODO(johnniwinther): Initialize core types in [initializeCoreClasses] and
     // make its field final.
-    _reporter = new _CompilerDiagnosticReporter(
-        this, options.diagnosticOptions);
+    _reporter = new _CompilerDiagnosticReporter(this, options);
     _parsing = new _CompilerParsing(this);
     _resolution = new _CompilerResolution(this);
     _coreTypes = new _CompilerCoreTypes(_resolution);
     types = new Types(_resolution);
     tracer = new Tracer(this, this.outputProvider);
 
     if (options.verbose) {
       progress = new Stopwatch()..start();
     }
 
@@ skipping 10 matching lines @@
       backend = jsBackend;
     } else {
       backend = new dart_backend.DartBackend(this, options.strips,
           multiFile: options.dart2dartMultiFile);
       if (options.dumpInfo) {
         throw new ArgumentError('--dump-info is not supported for dart2dart.');
       }
     }
 
     tasks = [
-      dietParser = new DietParserTask(
-          this, enableConditionalDirectives: options.enableConditionalDirectives),
+      dietParser = new DietParserTask(this, parsing.parserOptions),
       scanner = createScannerTask(),
       serialization = new SerializationTask(this),
       libraryLoader = new LibraryLoaderTask(this,
           new _ResolvedUriTranslator(this),
           new _ScriptLoader(this),
           new _ElementScanner(scanner),
           this.serialization,
           this,
           environment),
-      parser = new ParserTask(this,
-          enableConditionalDirectives: options.enableConditionalDirectives),
-      patchParser = new PatchParserTask(
-          this, enableConditionalDirectives: options.enableConditionalDirectives),
+      parser = new ParserTask(this, parsing.parserOptions),
+      patchParser = new PatchParserTask(this, parsing.parserOptions),
       resolver = createResolverTask(),
       closureToClassMapper = new closureMapping.ClosureTask(this),
       checker = new TypeCheckerTask(this),
       typesTask = new ti.TypesTask(this),
       constants = backend.constantCompilerTask,
       deferredLoadTask = new DeferredLoadTask(this),
       mirrorUsageAnalyzerTask = new MirrorUsageAnalyzerTask(this),
       enqueuer = new EnqueueTask(this),
       dumpInfoTask = new DumpInfoTask(this),
       reuseLibraryTask = new GenericTask('Reuse library', this),
@@ skipping 1669 matching lines @@
 
   @override
   void parsePatchClass(ClassElement cls) {
     compiler.patchParser.measure(() {
       if (cls.isPatch) {
         compiler.patchParser.parsePatchClassNode(cls);
       }
     });
   }
 
-  ScannerOptions getScannerOptionsFor(Element element) {
-    return new ScannerOptions(
-      canUseNative: compiler.backend.canLibraryUseNative(element.library));
-  }
+  ScannerOptions getScannerOptionsFor(Element element) =>
+      new ScannerOptions.from(compiler, element.library);
+
+  ParserOptions get parserOptions => compiler.options;
 }
 
 class GlobalDependencyRegistry extends EagerRegistry {
   final Compiler compiler;
   Setlet<Element> _otherDependencies;
 
   GlobalDependencyRegistry(this.compiler) : super('GlobalDependencies', null);
 
   // TODO(johnniwinther): Rename world/universe/enqueuer through out the
   // compiler.
@@ skipping 37 matching lines @@
   _ElementScanner(this.scanner);
   void scanLibrary(LibraryElement library) => scanner.scanLibrary(library);
   void scanUnit(CompilationUnitElement unit) => scanner.scan(unit);
 }
 
 class _EmptyEnvironment implements Environment {
   const _EmptyEnvironment();
 
   String valueOf(String key) => null;
 }