Clean up patches so they can be compiled by Fasta.

Change-Id: Ie436375c78496366accf0ba82938e54cbe30b143
Reviewed-on: https://dart-review.googlesource.com/3001
Commit-Queue: Peter von der Ahé <ahe@google.com>
Reviewed-by: Lasse R.H. Nielsen <lrn@google.com>
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>

runtime/bin/common_patch.dart

@@ -2,7 +2,52 @@
 // 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.
 
-import 'dart:nativewrappers';
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:io" which contains all the imports used by
+/// patches of that library. We plan to change this when we have a shared front
+/// end and simply use parts.
+
+import "dart:_internal" show VMLibraryHooks, patch;
+
+import "dart:async"
+    show
+        Completer,
+        Future,
+        Stream,
+        StreamConsumer,
+        StreamController,
+        StreamSubscription,
+        Timer,
+        Zone,
+        scheduleMicrotask;
+
+import "dart:collection" show HashMap;
+
+import "dart:convert" show Encoding;
+
+import "dart:developer" show registerExtension;
+
+import "dart:isolate" show RawReceivePort, ReceivePort, SendPort;
+
+import "dart:math" show min;
+
+import "dart:nativewrappers" show NativeFieldWrapperClass1;
+
+import "dart:typed_data" show Uint8List;
+
+/// These are the additional parts of this patch library:
+// part "directory_patch.dart";
+// part "eventhandler_patch.dart";
+// part "file_patch.dart";
+// part "file_system_entity_patch.dart";
+// part "filter_patch.dart";
+// part "io_service_patch.dart";
+// part "platform_patch.dart";
+// part "process_patch.dart";
+// part "socket_patch.dart";
+// part "stdio_patch.dart";
+// part "secure_socket_patch.dart";
+// part "sync_socket_patch.dart";
 
 @patch
 class _IOCrypto {

runtime/bin/directory_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _Directory {
   @patch

runtime/bin/eventhandler_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _EventHandler {
   @patch

runtime/bin/file_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _File {
   @patch

runtime/bin/file_system_entity_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class FileStat {
   @patch

runtime/bin/filter_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 class _FilterImpl extends NativeFieldWrapperClass1 implements RawZLibFilter {
   void process(List<int> data, int start, int end) native "Filter_Process";
 

runtime/bin/io_service_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 class _IOServicePorts {
   // We limit the number of IO Service ports per isolate so that we don't
   // spawn too many threads all at once, which can crash the VM on Windows.

runtime/bin/platform_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _Platform {
   @patch

runtime/bin/process_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _WindowsCodePageDecoder {
   @patch

runtime/bin/secure_socket_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class SecureSocket {
   @patch

runtime/bin/socket_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class RawServerSocket {
   @patch

runtime/bin/stdio_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class _StdIOUtils {
   @patch

runtime/bin/sync_socket_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "common_patch.dart";
+
 @patch
 class RawSynchronousSocket {
   @patch

runtime/lib/array.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // TODO(srdjan): Use shared array implementation.
 class _List<E> extends FixedLengthListBase<E> {
   factory _List(length) native "List_allocate";

runtime/lib/array_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // The _GrowableArrayMarker class is used to signal to the List() factory
 // whether a parameter was passed.
 class _GrowableArrayMarker implements int {

runtime/lib/async_patch.dart

@@ -2,7 +2,17 @@
 // 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.
 
-import "dart:_internal" hide Symbol;
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:async" which contains all the imports used
+/// by patches of that library. We plan to change this when we have a shared
+/// front end and simply use parts.
+
+import "dart:_internal" show VMLibraryHooks, patch;
+
+/// These are the additional parts of this patch library:
+// part "deferred_load_patch.dart";
+// part "schedule_microtask_patch.dart";
+// part "timer_patch.dart";
 
 // Equivalent of calling FATAL from C++ code.
 _fatal(msg) native "DartAsync_fatal";

runtime/lib/bigint.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:typed_data' show Uint32List;
+// part of "core_patch.dart";
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

runtime/lib/bool_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-// Dart core library.
+// part of "core_patch.dart";
 
 @patch
 class bool {

runtime/lib/class_id.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:core' hide Symbol;
+// part of "internal_patch.dart";
 
 class ClassID {
   static int getID(Object value) native "ClassID_getID";

runtime/lib/collection_patch.dart

@@ -2,8 +2,19 @@
 // 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.
 
-import 'dart:typed_data';
+/// Note: the VM concatenates all patch files into a single patch file. This
-import 'dart:_internal' as internal;
+/// file is the first patch in "dart:collection" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:_internal" as internal;
+
+import "dart:_internal" show patch;
+
+import "dart:typed_data" show Uint32List;
+
+/// These are the additional parts of this patch library:
+// part "compact_hash.dart";
 
 @patch
 class HashMap<K, V> {
@@ -433,7 +444,7 @@ class _HashMapEntry {
   _HashMapEntry(this.key, this.value, this.hashCode, this.next);
 }
 
-abstract class _HashMapIterable<E> extends EfficientLengthIterable<E> {
+abstract class _HashMapIterable<E> extends internal.EfficientLengthIterable<E> {
   final HashMap _map;
   _HashMapIterable(this._map);
   int get length => _map.length;

runtime/lib/compact_hash.dart

@@ -2,8 +2,7 @@
 // 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.
 
-import 'dart:typed_data' show Uint32List;
+// part of "collection_patch.dart";
-import 'dart:_internal' as internal;
 
 // Hash table with open addressing that separates the index from keys/values.
 

runtime/lib/convert_patch.dart

@@ -2,7 +2,16 @@
 // 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.
 
-import "dart:_internal" show POWERS_OF_TEN;
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:convert" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:_internal" show POWERS_OF_TEN, patch;
+
+import "dart:typed_data" show Uint8List, Uint16List;
+
+/// This patch library has no additional parts.
 
 // JSON conversion.
 

runtime/lib/core_patch.dart

@@ -2,12 +2,81 @@
 // 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.
 
-import "dart:async";
+/// Note: the VM concatenates all patch files into a single patch file. This
-import 'dart:convert' show ASCII, JSON;
+/// file is the first patch in "dart:core" which contains all the imports
-import "dart:isolate";
+/// used by patches of that library. We plan to change this when we have a
-import "dart:math";
+/// shared front end and simply use parts.
-import "dart:typed_data";
+
-import 'dart:_internal' as internal;
+import "dart:_internal" as internal show Symbol;
+
+import "dart:_internal"
+    show
+        ClassID,
+        CodeUnits,
+        EfficientLengthIterable,
+        FixedLengthListBase,
+        IterableElementError,
+        ListIterator,
+        Lists,
+        POWERS_OF_TEN,
+        SubListIterable,
+        UnmodifiableListBase,
+        is64Bit,
+        makeFixedListUnmodifiable,
+        makeListFixedLength,
+        patch;
+
+import "dart:async" show Completer, Future, Timer;
+
+import "dart:collection"
+    show
+        HashMap,
+        IterableBase,
+        LinkedHashMap,
+        LinkedList,
+        LinkedListEntry,
+        ListBase,
+        Maps,
+        UnmodifiableMapView;
+
+import "dart:convert" show ASCII, Encoding, JSON, LATIN1, UTF8;
+
+import "dart:isolate" show Isolate;
+
+import "dart:math" show Random;
+
+import "dart:typed_data" show Uint8List, Int64List, Uint16List, Uint32List;
+
+/// These are the additional parts of this patch library:
+// part "array.dart";
+// part "array_patch.dart";
+// part "bigint.dart";
+// part "bool_patch.dart";
+// part "date_patch.dart";
+// part "double.dart";
+// part "double_patch.dart";
+// part "errors_patch.dart";
+// part "expando_patch.dart";
+// part "function.dart";
+// part "function_patch.dart";
+// part "growable_array.dart";
+// part "identical_patch.dart";
+// part "immutable_map.dart";
+// part "integers.dart";
+// part "integers_patch.dart";
+// part "invocation_mirror_patch.dart";
+// part "lib_prefix.dart";
+// part "map_patch.dart";
+// part "null_patch.dart";
+// part "object_patch.dart";
+// part "regexp_patch.dart";
+// part "stacktrace.dart";
+// part "stopwatch_patch.dart";
+// part "string_buffer_patch.dart";
+// part "string_patch.dart";
+// part "type_patch.dart";
+// part "uri_patch.dart";
+// part "weak_property.dart";
 
 // The members of this class are cloned and added to each class that
 // represents an enum type.

runtime/lib/date_patch.dart

@@ -1,7 +1,8 @@
 // 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.
-// Dart core library.
+
+// part of "core_patch.dart";
 
 // VM implementation of DateTime.
 @patch

runtime/lib/deferred_load_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "async_patch.dart";
+
 final Set<String> _loadedLibraries = new Set<String>();
 
 @patch

runtime/lib/developer.dart

@@ -2,8 +2,20 @@
 // 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.
 
-import 'dart:isolate';
+/// Note: the VM concatenates all patch files into a single patch file. This
-import 'dart:_internal' hide Symbol;
+/// file is the first patch in "dart:developer" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:_internal" show patch;
+
+import "dart:async" show Future, Zone;
+
+import "dart:isolate" show SendPort;
+
+/// These are the additional parts of this patch library:
+// part "profiler.dart"
+// part "timeline.dart"
 
 @patch
 bool debugger({bool when: true, String message}) native "Developer_debugger";

runtime/lib/double.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 class _Double implements double {
   factory _Double.fromInteger(int value) native "Double_doubleFromInteger";
 

runtime/lib/double_patch.dart

@@ -1,7 +1,8 @@
 // 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.
-// Dart core library.
+
+// part of "core_patch.dart";
 
 // VM implementation of double.
 

runtime/lib/errors_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 class Error {
   @patch

runtime/lib/expando_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 class Expando<T> {
   @patch

runtime/lib/function.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 class _Closure implements Function {
   bool operator ==(other) native "Closure_equals";
 

runtime/lib/function_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 class Function {
   // TODO(regis): Pass type arguments to generic functions. Wait for API spec.

runtime/lib/growable_array.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 class _GrowableList<T> extends ListBase<T> {
   void insert(int index, T element) {
     if ((index < 0) || (index > length)) {

runtime/lib/identical_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 bool identical(Object a, Object b) native "Identical_comparison";
 

runtime/lib/immutable_map.dart

@@ -1,8 +1,10 @@
 // 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.
-// Immutable map class for compiler generated map literals.
 
+// part of "core_patch.dart";
+
+/// Immutable map class for compiler generated map literals.
 class _ImmutableMap<K, V> implements Map<K, V> {
   final _ImmutableList _kvPairs;
 

runtime/lib/integers.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // This marker interface represents 64-bit integers in the compiler for type
 // propagation and range analysis.  It is implemented by _Smi and _Mint.
 abstract class _int64 implements int {}

runtime/lib/integers_patch.dart

@@ -1,10 +1,10 @@
 // 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.
-// Dart core library.
 
-// VM implementation of int.
+// part of "core_patch.dart";
 
+/// VM implementation of int.
 @patch
 class int {
   @patch
@@ -24,7 +24,7 @@ class int {
         return null; // Empty.
       }
     }
-    var smiLimit = internal.is64Bit ? 18 : 9;
+    var smiLimit = is64Bit ? 18 : 9;
     if ((last - ix) >= smiLimit) {
       return null; // May not fit into a Smi.
     }
@@ -109,7 +109,7 @@ class int {
 
   static int _parseRadix(
       String source, int radix, int start, int end, int sign) {
-    int tableIndex = (radix - 2) * 4 + (internal.is64Bit ? 2 : 0);
+    int tableIndex = (radix - 2) * 4 + (is64Bit ? 2 : 0);
     int blockSize = _PARSE_LIMITS[tableIndex];
     int length = end - start;
     if (length <= blockSize) {

runtime/lib/internal_patch.dart

@@ -2,8 +2,19 @@
 // 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.
 
-import 'dart:core' hide Symbol;
+/// Note: the VM concatenates all patch files into a single patch file. This
-import 'dart:typed_data' show Int32List;
+/// file is the first patch in "dart:_internal" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:core" hide Symbol;
+
+import "dart:typed_data" show Int32List;
+
+/// These are the additional parts of this patch library:
+// part "class_id_fasta.dart";
+// part "print_patch.dart";
+// part "symbol_patch.dart";
 
 @patch
 List makeListFixedLength(List growableList)

runtime/lib/invocation_mirror_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // NOTE: When making changes to this class, please also update
 // `VmTarget.instantiateInvocation` and `VmTarget._invocationType` in
 // `pkg/kernel/lib/target/vm.dart`.

runtime/lib/isolate_patch.dart

@@ -2,8 +2,20 @@
 // 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.
 
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:isolate" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:_internal" show VMLibraryHooks, patch;
+
+import "dart:async"
+    show Completer, Future, Stream, StreamController, StreamSubscription, Timer;
+
 import "dart:collection" show HashMap;
-import "dart:_internal" hide Symbol;
+
+/// These are the additional parts of this patch library:
+// part "timer_impl.dart";
 
 @patch
 class ReceivePort {

runtime/lib/lib_prefix.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // This type corresponds to the VM-internal class LibraryPrefix.
 class _LibraryPrefix {
   bool _load() native "LibraryPrefix_load";

runtime/lib/map_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 class Map<K, V> {
   // Factory constructing a Map from a parser generated Map literal.

runtime/lib/math_patch.dart

@@ -2,9 +2,16 @@
 // 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.
 
-import "dart:typed_data";
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:math" which contains all the imports used
+/// by patches of that library. We plan to change this when we have a shared
+/// front end and simply use parts.
 
-// A VM patch of the dart:math library.
+import "dart:_internal" show patch;
+
+import "dart:typed_data" show Uint32List;
+
+/// There are no parts of this patch library.
 
 @patch
 T min<T extends num>(T a, T b) {

runtime/lib/mirror_reference.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "mirrors_patch.dart";
+
 class _MirrorReference {
   factory _MirrorReference._uninstantiable() {
     throw new UnsupportedError("class _MirrorReference cannot be instantiated");

runtime/lib/mirrors_impl.dart

@@ -2,10 +2,7 @@
 // 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.
 
-// VM-specific implementation of the dart:mirrors library.
+// part of "mirrors_patch.dart";
-
-import "dart:collection" show UnmodifiableListView, UnmodifiableMapView;
-import "dart:_internal" as internal;
 
 var _dirty = false;
 final _emptyList = new UnmodifiableListView([]);

runtime/lib/mirrors_patch.dart

@@ -2,10 +2,23 @@
 // 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.
 
-import "dart:async" show Future;
+/// Note: the VM concatenates all patch files into a single patch file. This
-import "dart:collection" show UnmodifiableListView, UnmodifiableMapView;
+/// file is the first patch in "dart:_internal" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
 import "dart:_internal" as internal;
 
+import "dart:_internal" show patch;
+
+import "dart:async" show Future;
+
+import "dart:collection" show UnmodifiableListView, UnmodifiableMapView;
+
+/// These are the additional parts of this patch library:
+// part "mirrors_impl.dart";
+// part "mirror_reference.dart";
+
 /**
  * Returns a [MirrorSystem] for the current isolate.
  */

runtime/lib/null_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-// Dart core library.
+// part of "core_patch.dart";
 
 @patch
 class Null {

runtime/lib/object_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 int _getHash(obj) native "Object_getHash";
 int _setHash(obj, hash) native "Object_setHash";
 

runtime/lib/print_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:core' hide Symbol;
+// part of "internal_patch.dart";
 
 // A print-closure gets a String that should be printed. In general the
 // string is a line, but it may contain "\n" characters.

runtime/lib/profiler.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "developer.dart";
+
 @patch
 class UserTag {
   @patch

runtime/lib/regexp_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 @patch
 class RegExp {
   @patch
@@ -46,13 +48,13 @@ class RegExp {
   static const int _MAX_CACHE_SIZE = 256;
   static final Map<_RegExpHashKey, _RegExpHashValue> _cache =
       new HashMap<_RegExpHashKey, _RegExpHashValue>();
-  static final internal.LinkedList<_RegExpHashKey> _recentlyUsed =
+  static final LinkedList<_RegExpHashKey> _recentlyUsed =
-      new internal.LinkedList<_RegExpHashKey>();
+      new LinkedList<_RegExpHashKey>();
 }
 
 // Represents both a key in the regular expression cache as well as its
 // corresponding entry in the LRU list.
-class _RegExpHashKey extends internal.LinkedListEntry<_RegExpHashKey> {
+class _RegExpHashKey extends LinkedListEntry<_RegExpHashKey> {
   final String pattern;
   final bool multiLine;
   final bool caseSensitive;

runtime/lib/schedule_microtask_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "async_patch.dart";
+
 @patch
 class _AsyncRun {
   @patch

runtime/lib/stacktrace.dart

@@ -2,7 +2,9 @@
 // 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.
 
-// VM internal StackTrace implementation.
+// part of "core_patch.dart";
+
+/// VM internal StackTrace implementation.
 class _StackTrace implements StackTrace {
   // toString() is overridden on the C++ side.
 }

runtime/lib/stopwatch_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-// A VM patch of the stopwatch part of dart:core.
+// part of "core_patch.dart";
 
 @patch
 class Stopwatch {

runtime/lib/string_buffer_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:typed_data' show Uint16List;
+// part of "core_patch.dart";
 
 @patch
 class StringBuffer {

runtime/lib/string_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 const int _maxAscii = 0x7f;
 const int _maxLatin1 = 0xff;
 const int _maxUtf16 = 0xffff;

runtime/lib/symbol_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:core' hide Symbol;
+// part of "internal_patch.dart";
 
 @patch
 class Symbol {

runtime/lib/timeline.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "developer.dart";
+
 @patch
 bool _isDartStreamEnabled() native "Timeline_isDartStreamEnabled";
 

runtime/lib/timer_impl.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:_internal' hide Symbol;
+// part of "isolate_patch.dart";
 
 // Timer heap implemented as a array-based binary heap[0].
 // This allows for O(1) `first`, O(log(n)) `remove`/`removeFirst` and O(log(n))

runtime/lib/timer_patch.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'dart:_internal' hide Symbol;
+// part of "async_patch.dart";
 
 @patch
 class Timer {

runtime/lib/type_patch.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 // These Dart classes correspond to the VM internal implementation classes.
 
 // Equivalent of RawAbstractType.

runtime/lib/typed_data_patch.dart

@@ -2,10 +2,35 @@
 // 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.
 
-import "dart:_internal" hide Symbol;
+/// Note: the VM concatenates all patch files into a single patch file. This
+/// file is the first patch in "dart:typed_data" which contains all the imports
+/// used by patches of that library. We plan to change this when we have a
+/// shared front end and simply use parts.
+
+import "dart:_internal"
+    show
+        ClassID,
+        CodeUnits,
+        ExpandIterable,
+        IterableElementError,
+        ListMapView,
+        Lists,
+        MappedIterable,
+        MappedIterable,
+        ReversedListIterable,
+        SkipWhileIterable,
+        Sort,
+        SubListIterable,
+        TakeWhileIterable,
+        WhereIterable,
+        patch;
+
 import "dart:collection" show ListBase;
+
 import 'dart:math' show Random;
 
+/// There are no parts in patch library:
+
 @patch
 class ByteData implements TypedData {
   @patch

runtime/lib/uri_patch.dart

@@ -2,7 +2,8 @@
 // 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.
 
-// VM implementation of Uri.
+// part of "core_patch.dart";
+
 typedef Uri _UriBaseClosure();
 
 Uri _unsupportedUriBase() {
@@ -19,6 +20,7 @@ class Uri {
   static Uri get base => _uriBaseClosure();
 }
 
+/// VM implementation of Uri.
 @patch
 class _Uri {
   static final bool _isWindowsCached = _isWindowsPlatform;

runtime/lib/weak_property.dart

@@ -2,6 +2,8 @@
 // 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.
 
+// part of "core_patch.dart";
+
 class _WeakProperty {
   factory _WeakProperty(key, value) => _new(key, value);