Simplify how patch files are specified to analyzer.

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

Index: pkg/analyzer/lib/src/generated/sdk.dart
diff --git a/pkg/analyzer/lib/src/generated/sdk.dart b/pkg/analyzer/lib/src/generated/sdk.dart
index 397fb9d85d1cb963c07229c67d01bd7f7c55f9e3..df9b503b59d2c1e0062cfa324699a8d86af29186 100644
--- a/pkg/analyzer/lib/src/generated/sdk.dart
+++ b/pkg/analyzer/lib/src/generated/sdk.dart
@@ -7,7 +7,6 @@ library analyzer.src.generated.sdk;
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/src/generated/engine.dart'
     show AnalysisContext, AnalysisOptions, AnalysisOptionsImpl;
@@ -291,11 +290,6 @@ class SdkLibrariesReader_LibraryBuilder extends RecursiveAstVisitor<Object> {
   static String _DART2JS_PATH = "dart2jsPath";
 
   /**
-   * The name of the `dart2js` platform.
-   */
-  static String _DART2JS_PLATFORM = 'DART2JS_PLATFORM';
-
-  /**
    * The name of the optional parameter used to indicate whether the library is
    * documented.
    */
@@ -308,12 +302,6 @@ class SdkLibrariesReader_LibraryBuilder extends RecursiveAstVisitor<Object> {
   static String _CATEGORIES = "categories";
 
   /**
-   * The name of the optional parameter used to specify the patches for
-   * the library.
-   */
-  static String _PATCHES = "patches";
-
-  /**
    * The name of the optional parameter used to specify the platforms on which
    * the library can be used.
    */
@@ -391,30 +379,6 @@ class SdkLibrariesReader_LibraryBuilder extends RecursiveAstVisitor<Object> {
             library._implementation = (expression as BooleanLiteral).value;
           } else if (name == _DOCUMENTED) {
             library.documented = (expression as BooleanLiteral).value;
-          } else if (name == _PATCHES) {
-            if (expression is MapLiteral) {
-              expression.entries.forEach((MapLiteralEntry entry) {
-                int platforms = _convertPlatforms(entry.key);
-                Expression pathsListLiteral = entry.value;
-                if (pathsListLiteral is ListLiteral) {
-                  List<String> paths = <String>[];
-                  pathsListLiteral.elements.forEach((Expression pathExpr) {
-                    if (pathExpr is SimpleStringLiteral) {
-                      String path = pathExpr.value;
-                      _validatePatchPath(path);
-                      paths.add(path);
-                    } else {
-                      throw new ArgumentError(
-                          'The "patch" argument items must be simple strings.');
-                    }
-                  });
-                  library.setPatchPaths(platforms, paths);
-                } else {
-                  throw new ArgumentError(
-                      'The "patch" argument values must be list literals.');
-                }
-              });
-            }
           } else if (name == _PLATFORMS) {
             if (expression is SimpleIdentifier) {
               String identifier = expression.name;
@@ -435,61 +399,6 @@ class SdkLibrariesReader_LibraryBuilder extends RecursiveAstVisitor<Object> {
     }
     return null;
   }
-
-  /**
-   * Validate the given [path] to a patch file. Throw [ArgumentError] if not a
-   * valid path: is absolute, or contains `..`.
-   */
-  void _validatePatchPath(String path) {
-    if (path.contains(r'\')) {
-      throw new ArgumentError('The path to a patch file must be posix: $path');
-    }
-    if (path.contains('..')) {
-      throw new ArgumentError(
-          'The path to a patch file cannot contain "..": $path');
-    }
-    if (path.startsWith('/')) {
-      throw new ArgumentError(
-          'The path to a patch file cannot be absolute: $path');
-    }
-  }
-
-  /**
-   * Return the platform constant value for the given [expr].
-   * Throw [ArgumentError] if not a valid platform name given.
-   */
-  static int _convertPlatform(Expression expr) {
-    if (expr is SimpleIdentifier) {
-      String name = expr.name;
-      if (name == _DART2JS_PLATFORM) {
-        return SdkLibraryImpl.DART2JS_PLATFORM;
-      }
-      if (name == _VM_PLATFORM) {
-        return SdkLibraryImpl.VM_PLATFORM;
-      }
-      throw new ArgumentError('Invalid platform name: $name');
-    }
-    throw new ArgumentError('Invalid platform type: ${expr.runtimeType}');
-  }
-
-  /**
-   * Return the platforms combination value for the [expr], which should be
-   * either `name1 | name2` or `name`.  Throw [ArgumentError] if any of the
-   * names is not a valid platform name.
-   */
-  static int _convertPlatforms(Expression expr) {
-    if (expr is BinaryExpression) {
-      TokenType operator = expr.operator?.type;
-      if (operator == TokenType.BAR) {
-        return _convertPlatforms(expr.leftOperand) |
-            _convertPlatforms(expr.rightOperand);
-      } else {
-        throw new ArgumentError('Invalid platforms combination: $operator');
-      }
-    } else {
-      return _convertPlatform(expr);
-    }
-  }
 }
 
 /**
@@ -542,12 +451,6 @@ abstract class SdkLibrary {
    * including `dart:`.
    */
   String get shortName;
-
-  /**
-   * Return the list of paths to the patch files that should be applied
-   * to this library for the given [platform], not `null`.
-   */
-  List<String> getPatches(int platform);
 }
 
 /**
@@ -600,14 +503,6 @@ class SdkLibraryImpl implements SdkLibrary {
   int _platforms = 0;
 
   /**
-   * The mapping from the platform combination to the list of paths (relative
-   * to the `sdk/lib` folder) of patches that should be applied to this library
-   * on every platform in the combination.
-   */
-  final Map<int, List<String>> _platformsToPatchPaths =
-      new HashMap<int, List<String>>();
-
-  /**
    * Initialize a newly created library to represent the library with the given
    * [name].
    */
@@ -638,17 +533,6 @@ class SdkLibraryImpl implements SdkLibrary {
   @override
   bool get isVmLibrary => (_platforms & VM_PLATFORM) != 0;
 
-  @override
-  List<String> getPatches(int platform) {
-    List<String> paths = <String>[];
-    _platformsToPatchPaths.forEach((int platforms, List<String> value) {
-      if ((platforms & platform) != 0) {
-        paths.addAll(value);
-      }
-    });
-    return paths;
-  }
-
   /**
    * Record that this library can be compiled to JavaScript by dart2js.
    */
@@ -657,14 +541,6 @@ class SdkLibraryImpl implements SdkLibrary {
   }
 
   /**
-   * Add a new patch with the given [path] that should be applied for the
-   * given [platforms].
-   */
-  void setPatchPaths(int platforms, List<String> paths) {
-    _platformsToPatchPaths[platforms] = paths;
-  }
-
-  /**
    * Record that this library can be run on the VM.
    */
   void setVmLibrary() {