Simplify how patch files are specified to analyzer.

pkg/analyzer/lib/src/generated/engine.dart

 // Copyright (c) 2014, 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 analyzer.src.generated.engine;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 1045 matching lines @@
 class AnalysisNotScheduledError implements Exception {}
 
 /**
  * A set of analysis options used to control the behavior of an analysis
  * context.
  */
 abstract class AnalysisOptions {
   /**
    * The length of the list returned by [encodeCrossContextOptions].
    */
-  static const int crossContextOptionsLength = 2;
+  static const int crossContextOptionsLength = 1;
 
   /**
    * Function that returns `true` if analysis is to parse and analyze function
    * bodies for a given source.
    */
   AnalyzeFunctionBodiesPredicate get analyzeFunctionBodiesPredicate;
 
   /**
    * DEPRECATED: Return the maximum number of sources for which AST structures should be
    * kept in the cache.
@@ skipping 144 matching lines @@
    */
   bool get lint;
 
   /**
    * Return a list of the lint rules that are to be run in an analysis context
    * if [lint] returns `true`.
    */
   List<Linter> get lintRules;
 
   /**
-   * Return the "platform" bit mask which should be used to apply patch files,
-   * or `0` if no patch files should be applied.
+   * A mapping from Dart SDK library name (e.g. "dart:core") to a list of paths
+   * to patch files that should be applied to the library.
    */
-  int get patchPlatform;
+  Map<String, List<String>> get patchPaths;
 
   /**
    * Return `true` if analysis is to parse comments.
    */
   bool get preserveComments;
 
   /**
    * Return `true` if strong mode analysis should be used.
    */
   bool get strongMode;
@@ skipping 133 matching lines @@
 
   @override
   bool lint = false;
 
   /**
    * The lint rules that are to be run in an analysis context if [lint] returns
    * `true`.
    */
   List<Linter> _lintRules;
 
-  @override
-  int patchPlatform = 0;
+  Map<String, List<String>> patchPaths = {};
 
   @override
   bool preserveComments = true;
 
   @override
   bool strongMode = false;
 
   /**
    * A flag indicating whether strong-mode inference hints should be
    * used.  This flag is not exposed in the interface, and should be
@@ skipping 69 matching lines @@
     strongMode = options.strongMode;
     if (options is AnalysisOptionsImpl) {
       strongModeHints = options.strongModeHints;
       implicitCasts = options.implicitCasts;
       nonnullableTypes = options.nonnullableTypes;
       implicitDynamic = options.implicitDynamic;
     }
     trackCacheDependencies = options.trackCacheDependencies;
     disableCacheFlushing = options.disableCacheFlushing;
     finerGrainedInvalidation = options.finerGrainedInvalidation;
-    patchPlatform = options.patchPlatform;
+    patchPaths = options.patchPaths;
   }
 
   bool get analyzeFunctionBodies {
     if (identical(analyzeFunctionBodiesPredicate, _analyzeAllFunctionBodies)) {
       return true;
     } else if (identical(
         analyzeFunctionBodiesPredicate, _analyzeNoFunctionBodies)) {
       return false;
     } else {
       throw new StateError('analyzeFunctionBodiesPredicate in use');
@@ skipping 90 matching lines @@
   }
 
   @override
   List<int> encodeCrossContextOptions() {
     int flags =
         (enableLazyAssignmentOperators ? ENABLE_LAZY_ASSIGNMENT_OPERATORS : 0) |
             (enableStrictCallChecks ? ENABLE_STRICT_CALL_CHECKS_FLAG : 0) |
             (enableSuperMixins ? ENABLE_SUPER_MIXINS_FLAG : 0) |
             (strongMode ? ENABLE_STRONG_MODE_FLAG : 0) |
             (strongModeHints ? ENABLE_STRONG_MODE_HINTS_FLAG : 0);
-    return <int>[flags, patchPlatform];
+    return <int>[flags];
   }
 
   @override
   void resetToDefaults() {
     dart2jsHint = false;
     disableCacheFlushing = false;
     enableAssertInitializer = false;
     enableLazyAssignmentOperators = false;
     enableStrictCallChecks = false;
     enableSuperMixins = false;
     enableTiming = false;
     enableUriInPartOf = false;
     _errorProcessors = null;
     _excludePatterns = null;
     finerGrainedInvalidation = false;
     generateImplicitErrors = true;
     generateSdkErrors = false;
     hint = true;
     implicitCasts = true;
     implicitDynamic = true;
     incremental = false;
     incrementalApi = false;
     incrementalValidation = false;
     lint = false;
     _lintRules = null;
     nonnullableTypes = NONNULLABLE_TYPES;
-    patchPlatform = 0;
+    patchPaths = {};
     preserveComments = true;
     strongMode = false;
     strongModeHints = false;
     trackCacheDependencies = true;
   }
 
   @override
   void setCrossContextOptionsFrom(AnalysisOptions options) {
     enableLazyAssignmentOperators = options.enableLazyAssignmentOperators;
     enableStrictCallChecks = options.enableStrictCallChecks;
     enableSuperMixins = options.enableSuperMixins;
     strongMode = options.strongMode;
     if (options is AnalysisOptionsImpl) {
       strongModeHints = options.strongModeHints;
     }
-    patchPlatform = options.patchPlatform;
   }
 
   /**
    * Produce a human readable list of option names corresponding to the options
    * encoded in the given [encoding], presumably from invoking the method
    * [encodeCrossContextOptions].
    */
   static String decodeCrossContextOptions(List<int> encoding) {
     List<String> parts = [];
     int flags = encoding[0];
@@ skipping 1193 matching lines @@
    */
   bool get wereSourcesAdded => _changeSet.addedSources.length > 0;
 
   /**
    * Return `true` if any sources were removed or deleted.
    */
   bool get wereSourcesRemoved =>
       _changeSet.removedSources.length > 0 ||
       _changeSet.removedContainers.length > 0;
 }