From 3b3e87cabc6b2132dbe3fc5f9977a66e500a86c0 Mon Sep 17 00:00:00 2001 From: "lrn@google.com" Date: Thu, 16 Jan 2014 12:06:38 +0000 Subject: [PATCH] Revert "Rename internal library dart:_collection-dev to dart:_internal." Dartium needs updating too. Committed: https://code.google.com/p/dart/source/detail?r=31827 R=floitsch@google.com Review URL: https://codereview.chromium.org//133273011 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@31877 260f80e4-7a28-3924-810f-c04153c831b5 --- .../test/generated/resolver_test.dart | 2 +- runtime/bin/dartutils.cc | 10 +- runtime/bin/dartutils.h | 2 +- .../deployed/web/index.html_bootstrap.dart.js | 2 +- .../web/index_devtools.html_bootstrap.dart.js | 4 +- runtime/lib/errors_patch.dart | 6 +- runtime/lib/function_patch.dart | 2 +- ...ion_dev_patch.dart => internal_patch.dart} | 0 ...dev_sources.gypi => internal_sources.gypi} | 4 +- runtime/lib/invocation_mirror_patch.dart | 8 +- runtime/lib/mirrors_patch.dart | 3 +- runtime/lib/object_patch.dart | 4 +- runtime/lib/typed_data.dart | 3 + runtime/vm/benchmark_test.cc | 4 +- runtime/vm/bootstrap.cc | 8 +- runtime/vm/bootstrap.h | 4 +- runtime/vm/dart_api_impl_test.cc | 4 +- runtime/vm/intermediate_language.cc | 2 +- runtime/vm/intermediate_language.h | 2 +- runtime/vm/isolate_test.cc | 2 +- runtime/vm/object.cc | 4 +- runtime/vm/object.h | 2 +- runtime/vm/object_store.h | 14 +- runtime/vm/parser.cc | 4 +- runtime/vm/symbols.h | 2 +- runtime/vm/vm.gypi | 498 +++++++++--------- .../compiler/implementation/compiler.dart | 4 +- .../implementation/js_backend/backend.dart | 2 +- sdk/lib/_internal/lib/core_patch.dart | 2 +- sdk/lib/_internal/lib/interceptors.dart | 4 +- ...ion_dev_patch.dart => internal_patch.dart} | 2 +- sdk/lib/_internal/lib/js_helper.dart | 4 +- sdk/lib/_internal/lib/js_mirrors.dart | 2 +- sdk/lib/_internal/libraries.dart | 6 +- sdk/lib/async/async.dart | 2 +- sdk/lib/collection/collection.dart | 2 +- sdk/lib/core/core.dart | 4 +- sdk/lib/core/symbol.dart | 2 +- sdk/lib/html/dart2js/html_dart2js.dart | 2 +- sdk/lib/html/dartium/html_dartium.dart | 8 +- .../internal.dart} | 2 +- .../internal_sources.gypi} | 4 +- .../iterable.dart | 2 +- .../{_collection_dev => internal}/list.dart | 2 +- .../{_collection_dev => internal}/lists.dart | 2 +- .../{_collection_dev => internal}/print.dart | 2 +- .../{_collection_dev => internal}/sort.dart | 2 +- .../{_collection_dev => internal}/symbol.dart | 2 +- sdk/lib/io/io.dart | 2 +- sdk/lib/svg/dart2js/svg_dart2js.dart | 2 +- sdk/lib/svg/dartium/svg_dartium.dart | 2 +- .../dart2js/typed_data_dart2js.dart | 2 +- sdk/lib/typed_data/typed_data.dart | 2 - .../web_audio/dart2js/web_audio_dart2js.dart | 2 +- .../web_audio/dartium/web_audio_dartium.dart | 2 +- sdk/lib/web_gl/dart2js/web_gl_dart2js.dart | 2 +- sdk/lib/web_gl/dartium/web_gl_dartium.dart | 2 +- sdk/lib/web_sql/dart2js/web_sql_dart2js.dart | 2 +- sdk/lib/web_sql/dartium/web_sql_dartium.dart | 2 +- tests/language/import_private_test.dart | 2 +- tools/create_sdk.py | 6 +- .../html/dart2js/html_dart2js.darttemplate | 2 +- .../html/dart2js/svg_dart2js.darttemplate | 2 +- .../dart2js/web_audio_dart2js.darttemplate | 2 +- .../html/dart2js/web_gl_dart2js.darttemplate | 2 +- .../html/dart2js/web_sql_dart2js.darttemplate | 2 +- .../html/dartium/html_dartium.darttemplate | 2 +- .../html/dartium/svg_dartium.darttemplate | 2 +- .../dartium/web_audio_dartium.darttemplate | 2 +- .../html/dartium/web_gl_dartium.darttemplate | 2 +- .../html/dartium/web_sql_dartium.darttemplate | 2 +- 71 files changed, 356 insertions(+), 358 deletions(-) rename runtime/lib/{collection_dev_patch.dart => internal_patch.dart} (100%) rename runtime/lib/{collection_dev_sources.gypi => internal_sources.gypi} (80%) rename sdk/lib/_internal/lib/{collection_dev_patch.dart => internal_patch.dart} (99%) rename sdk/lib/{_collection_dev/collection_dev.dart => internal/internal.dart} (93%) rename sdk/lib/{_collection_dev/collection_dev_sources.gypi => internal/internal_sources.gypi} (81%) rename sdk/lib/{_collection_dev => internal}/iterable.dart (99%) rename sdk/lib/{_collection_dev => internal}/list.dart (99%) rename sdk/lib/{_collection_dev => internal}/lists.dart (98%) rename sdk/lib/{_collection_dev => internal}/print.dart (94%) rename sdk/lib/{_collection_dev => internal}/sort.dart (99%) rename sdk/lib/{_collection_dev => internal}/symbol.dart (98%) diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart index 7ac65007199..7283b20d956 100644 --- a/pkg/analyzer/test/generated/resolver_test.dart +++ b/pkg/analyzer/test/generated/resolver_test.dart @@ -11241,7 +11241,7 @@ class CompileTimeErrorCodeTest extends ResolverTestCase { } void test_importInternalLibrary_collection() { - Source source = addSource(EngineTestCase.createSource(["import 'dart:_collection-dev';"])); + Source source = addSource(EngineTestCase.createSource(["import 'dart:_internal';"])); resolve(source); // Note, in these error cases we may generate an UNUSED_IMPORT hint, while we could prevent // the hint from being generated by testing the import directive for the error, this is such a diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc index 1051f4825a6..2b8e495799a 100644 --- a/runtime/bin/dartutils.cc +++ b/runtime/bin/dartutils.cc @@ -26,8 +26,8 @@ const char* DartUtils::kDartScheme = "dart:"; const char* DartUtils::kDartExtensionScheme = "dart-ext:"; const char* DartUtils::kAsyncLibURL = "dart:async"; const char* DartUtils::kBuiltinLibURL = "dart:builtin"; -const char* DartUtils::kCollectionDevLibURL = "dart:_collection-dev"; const char* DartUtils::kCoreLibURL = "dart:core"; +const char* DartUtils::kInternalLibURL = "dart:_internal"; const char* DartUtils::kIsolateLibURL = "dart:isolate"; const char* DartUtils::kIOLibURL = "dart:io"; const char* DartUtils::kIOLibPatchURL = "dart:io-patch"; @@ -679,11 +679,11 @@ Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root, // Setup the internal library's 'internalPrint' function. Dart_Handle print = Dart_Invoke( builtin_lib, NewString("_getPrintClosure"), 0, NULL); - Dart_Handle url = NewString(kCollectionDevLibURL); + Dart_Handle url = NewString(kInternalLibURL); DART_CHECK_VALID(url); - Dart_Handle collection_dev_lib = Dart_LookupLibrary(url); - DART_CHECK_VALID(collection_dev_lib); - Dart_Handle result = Dart_SetField(collection_dev_lib, + Dart_Handle internal_lib = Dart_LookupLibrary(url); + DART_CHECK_VALID(internal_lib); + Dart_Handle result = Dart_SetField(internal_lib, NewString("_printClosure"), print); DART_CHECK_VALID(result); diff --git a/runtime/bin/dartutils.h b/runtime/bin/dartutils.h index d735e52b59f..fc7963b0876 100644 --- a/runtime/bin/dartutils.h +++ b/runtime/bin/dartutils.h @@ -207,8 +207,8 @@ class DartUtils { static const char* kDartExtensionScheme; static const char* kAsyncLibURL; static const char* kBuiltinLibURL; - static const char* kCollectionDevLibURL; static const char* kCoreLibURL; + static const char* kInternalLibURL; static const char* kIsolateLibURL; static const char* kIOLibURL; static const char* kIOLibPatchURL; diff --git a/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js b/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js index 975dd844a5b..cfdacaab9c1 100644 --- a/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js +++ b/runtime/bin/vmservice/client/deployed/web/index.html_bootstrap.dart.js @@ -10540,7 +10540,7 @@ zO:{ call$0:[function(){if(B.G9()){var z=H.VM(new P.vs(0,$.X3,null,null,null,null,null,null),[null]) z.L7(null,null) return z}return H.VM(new W.RO(document,"WebComponentsReady",!1),[null]).gFV(0)},"call$0" /* tearOffInfo */,null,0,0,null,"call"], -$isEH:true}}],["dart._collection.dev","dart:_collection-dev",,H,{ +$isEH:true}}],["dart._collection.dev","dart:_internal",,H,{ "":"", bQ:[function(a,b){var z for(z=H.VM(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.G();)b.call$1(z.mD)},"call$2" /* tearOffInfo */,"Mn",4,0,null,109,110], diff --git a/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js b/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js index 3ec7fde345a..f8f4a23817c 100644 --- a/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js +++ b/runtime/bin/vmservice/client/deployed/web/index_devtools.html_bootstrap.dart.js @@ -10540,7 +10540,7 @@ zO:{ call$0:[function(){if(B.G9()){var z=H.VM(new P.vs(0,$.X3,null,null,null,null,null,null),[null]) z.L7(null,null) return z}return H.VM(new W.RO(document,"WebComponentsReady",!1),[null]).gFV(0)},"call$0" /* tearOffInfo */,null,0,0,null,"call"], -$isEH:true}}],["dart._collection.dev","dart:_collection-dev",,H,{ +$isEH:true}}],["dart._collection.dev","dart:_internal",,H,{ "":"", bQ:[function(a,b){var z for(z=H.VM(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.G();)b.call$1(z.mD)},"call$2" /* tearOffInfo */,"Mn",4,0,null,109,110], @@ -32715,7 +32715,7 @@ zO:{ call$0:[function(){if(B.G9()){var z=H.VM(new P.vs(0,$.X3,null,null,null,null,null,null),[null]) z.L7(null,null) return z}return H.VM(new W.RO(document,"WebComponentsReady",!1),[null]).gFV(0)},"call$0" /* tearOffInfo */,null,0,0,null,"call"], -$isEH:true}}],["dart._collection.dev","dart:_collection-dev",,H,{ +$isEH:true}}],["dart._collection.dev","dart:_internal",,H,{ "":"", bQ:[function(a,b){var z for(z=H.VM(new H.a7(a,a.length,0,null),[H.Kp(a,0)]);z.G();)b.call$1(z.mD)},"call$2" /* tearOffInfo */,"Mn",4,0,null,109,110], diff --git a/runtime/lib/errors_patch.dart b/runtime/lib/errors_patch.dart index 6bb2572ea52..31de11dbcc4 100644 --- a/runtime/lib/errors_patch.dart +++ b/runtime/lib/errors_patch.dart @@ -216,7 +216,7 @@ patch class NoSuchMethodError { var args_message = args_mismatch ? " with matching arguments" : ""; var msg; var memberName = - (_memberName == null) ? "" :_collection_dev.Symbol.getName(_memberName); + (_memberName == null) ? "" : internal.Symbol.getName(_memberName); switch (level) { case _InvocationMirror._DYNAMIC: { if (_receiver == null) { @@ -276,7 +276,7 @@ patch class NoSuchMethodError { if (i > 0) { actual_buf.write(", "); } - actual_buf.write(_collection_dev.Symbol.getName(key)); + actual_buf.write(internal.Symbol.getName(key)); actual_buf.write(": "); actual_buf.write(Error.safeToString(value)); i++; @@ -293,7 +293,7 @@ patch class NoSuchMethodError { receiver_str = Error.safeToString(_receiver); } var memberName = - (_memberName == null) ? "" :_collection_dev.Symbol.getName(_memberName); + (_memberName == null) ? "" : internal.Symbol.getName(_memberName); if (!args_mismatch) { msg_buf.write( "NoSuchMethodError : method not found: '$memberName'\n" diff --git a/runtime/lib/function_patch.dart b/runtime/lib/function_patch.dart index 969836d4306..c94c78bb902 100644 --- a/runtime/lib/function_patch.dart +++ b/runtime/lib/function_patch.dart @@ -22,7 +22,7 @@ patch class Function { if (numNamedArguments > 0) { namedArguments.forEach((name, value) { arguments[argumentIndex++] = value; - names[nameIndex++] = _collection_dev.Symbol.getName(name); + names[nameIndex++] = internal.Symbol.getName(name); }); } return _apply(arguments, names); diff --git a/runtime/lib/collection_dev_patch.dart b/runtime/lib/internal_patch.dart similarity index 100% rename from runtime/lib/collection_dev_patch.dart rename to runtime/lib/internal_patch.dart diff --git a/runtime/lib/collection_dev_sources.gypi b/runtime/lib/internal_sources.gypi similarity index 80% rename from runtime/lib/collection_dev_sources.gypi rename to runtime/lib/internal_sources.gypi index 63c909fcfc7..66fdf9d9eb9 100644 --- a/runtime/lib/collection_dev_sources.gypi +++ b/runtime/lib/internal_sources.gypi @@ -2,11 +2,11 @@ # 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. -# Sources that patch the library "dart:_collection-dev". +# Sources that patch the library "dart:_internal". { 'sources': [ - 'collection_dev_patch.dart', + 'internal_patch.dart', # The above file needs to be first as it imports required libraries. 'print_patch.dart', 'symbol_patch.dart', diff --git a/runtime/lib/invocation_mirror_patch.dart b/runtime/lib/invocation_mirror_patch.dart index d697cc412f3..5b866602ae1 100644 --- a/runtime/lib/invocation_mirror_patch.dart +++ b/runtime/lib/invocation_mirror_patch.dart @@ -40,15 +40,15 @@ class _InvocationMirror implements Invocation { if (_functionName.startsWith("get:")) { _type = _GETTER; _memberName = - new _collection_dev.Symbol.unvalidated(_functionName.substring(4)); + new internal.Symbol.unvalidated(_functionName.substring(4)); } else if (_functionName.startsWith("set:")) { _type = _SETTER; _memberName = - new _collection_dev.Symbol.unvalidated( + new internal.Symbol.unvalidated( _functionName.substring(4) + "="); } else { _type = _isSuperInvocation ? (_SUPER << _CALL_SHIFT) | _METHOD : _METHOD; - _memberName = new _collection_dev.Symbol.unvalidated(_functionName); + _memberName = new internal.Symbol.unvalidated(_functionName); } } @@ -85,7 +85,7 @@ class _InvocationMirror implements Invocation { for (int i = 0; i < numNamedArguments; i++) { String arg_name = _argumentsDescriptor[2 + 2*i]; var arg_value = _arguments[_argumentsDescriptor[3 + 2*i]]; - _namedArguments[new _collection_dev.Symbol.unvalidated(arg_name)] = + _namedArguments[new internal.Symbol.unvalidated(arg_name)] = arg_value; } } diff --git a/runtime/lib/mirrors_patch.dart b/runtime/lib/mirrors_patch.dart index 6f3c43609cc..12cbd569159 100644 --- a/runtime/lib/mirrors_patch.dart +++ b/runtime/lib/mirrors_patch.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. -// TODO(ahe): Move _symbol_dev.Symbol to its own "private" library? -import "dart:_collection-dev" as _symbol_dev; +import "dart:_internal" as _symbol_dev; /** * Returns a [MirrorSystem] for the current isolate. diff --git a/runtime/lib/object_patch.dart b/runtime/lib/object_patch.dart index 491f9c0c371..fa8e10e5d4a 100644 --- a/runtime/lib/object_patch.dart +++ b/runtime/lib/object_patch.dart @@ -43,7 +43,7 @@ patch class Object { /* patch */ noSuchMethod(Invocation invocation) { return _noSuchMethod(invocation.isMethod, - _collection_dev.Symbol.getName(invocation.memberName), + internal.Symbol.getName(invocation.memberName), invocation._type, invocation.positionalArguments, _symbolMapToStringMap(invocation.namedArguments)); @@ -66,7 +66,7 @@ patch class Object { static _symbolMapToStringMap(Map map) { var result = new Map(); map.forEach((Symbol key, value) { - result[_collection_dev.Symbol.getName(key)] = value; + result[internal.Symbol.getName(key)] = value; }); return result; } diff --git a/runtime/lib/typed_data.dart b/runtime/lib/typed_data.dart index 376acb33bdc..7ea3c7894b6 100644 --- a/runtime/lib/typed_data.dart +++ b/runtime/lib/typed_data.dart @@ -4,6 +4,9 @@ // patch classes for Int8List ..... Float64List and ByteData implementations. +import "dart:_internal"; +import 'dart:math' show Random; + patch class Int8List { /* patch */ factory Int8List(int length) { return new _Int8Array(length); diff --git a/runtime/vm/benchmark_test.cc b/runtime/vm/benchmark_test.cc index 2a07e6445b2..62c04de02ec 100644 --- a/runtime/vm/benchmark_test.cc +++ b/runtime/vm/benchmark_test.cc @@ -414,7 +414,7 @@ BENCHMARK(CoreSnapshotSize) { "import 'dart:async';\n" "import 'dart:core';\n" "import 'dart:collection';\n" - "import 'dart:_collection-dev';\n" + "import 'dart:_internal';\n" "import 'dart:math';\n" "import 'dart:isolate';\n" "import 'dart:mirrors';\n" @@ -440,7 +440,7 @@ BENCHMARK(StandaloneSnapshotSize) { "import 'dart:async';\n" "import 'dart:core';\n" "import 'dart:collection';\n" - "import 'dart:_collection-dev';\n" + "import 'dart:_internal';\n" "import 'dart:convert';\n" "import 'dart:math';\n" "import 'dart:isolate';\n" diff --git a/runtime/vm/bootstrap.cc b/runtime/vm/bootstrap.cc index b04165a7ca4..fd4ce60818e 100644 --- a/runtime/vm/bootstrap.cc +++ b/runtime/vm/bootstrap.cc @@ -46,10 +46,10 @@ static bootstrap_lib_props bootstrap_libraries[] = { collection, Bootstrap::collection_source_paths_, Bootstrap::collection_patch_paths_), - INIT_LIBRARY(ObjectStore::kCollectionDev, - _collection-dev, - Bootstrap::collection_dev_source_paths_, - Bootstrap::collection_dev_patch_paths_), + INIT_LIBRARY(ObjectStore::kInternal, + _internal, + Bootstrap::internal_source_paths_, + Bootstrap::internal_patch_paths_), INIT_LIBRARY(ObjectStore::kIsolate, isolate, Bootstrap::isolate_source_paths_, diff --git a/runtime/vm/bootstrap.h b/runtime/vm/bootstrap.h index 6ebc8124637..5d3e53ba611 100644 --- a/runtime/vm/bootstrap.h +++ b/runtime/vm/bootstrap.h @@ -23,8 +23,8 @@ class Bootstrap : public AllStatic { static const char* async_source_paths_[]; static const char* corelib_source_paths_[]; static const char* collection_source_paths_[]; - static const char* collection_dev_source_paths_[]; static const char* convert_source_paths_[]; + static const char* internal_source_paths_[]; static const char* isolate_source_paths_[]; static const char* json_source_paths_[]; static const char* math_source_paths_[]; @@ -36,8 +36,8 @@ class Bootstrap : public AllStatic { static const char* async_patch_paths_[]; static const char* corelib_patch_paths_[]; static const char* collection_patch_paths_[]; - static const char* collection_dev_patch_paths_[]; static const char* convert_patch_paths_[]; + static const char* internal_patch_paths_[]; static const char* isolate_patch_paths_[]; static const char* math_patch_paths_[]; static const char* mirrors_patch_paths_[]; diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc index f04834043c1..30b3ad5ae5d 100644 --- a/runtime/vm/dart_api_impl_test.cc +++ b/runtime/vm/dart_api_impl_test.cc @@ -4616,7 +4616,7 @@ TEST_CASE(Invoke_Null) { TEST_CASE(InvokeNoSuchMethod) { const char* kScriptChars = - "import 'dart:_collection-dev' as _collection_dev;\n" + "import 'dart:_internal' as _internal;\n" "class Expect {\n" " static equals(a, b) {\n" " if (a != b) {\n" @@ -4627,7 +4627,7 @@ TEST_CASE(InvokeNoSuchMethod) { "class TestClass {\n" " static int fld1 = 0;\n" " void noSuchMethod(Invocation invocation) {\n" - " var name = _collection_dev.Symbol.getName(invocation.memberName);\n" + " var name = _internal.Symbol.getName(invocation.memberName);\n" " if (name == 'fld') {\n" " Expect.equals(true, invocation.isGetter);\n" " Expect.equals(false, invocation.isMethod);\n" diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc index d4c3508e175..68d8201136b 100644 --- a/runtime/vm/intermediate_language.cc +++ b/runtime/vm/intermediate_language.cc @@ -378,7 +378,7 @@ static bool IsRecognizedLibrary(const Library& library) { return (library.raw() == Library::CoreLibrary()) || (library.raw() == Library::MathLibrary()) || (library.raw() == Library::TypedDataLibrary()) - || (library.raw() == Library::CollectionDevLibrary()); + || (library.raw() == Library::InternalLibrary()); } diff --git a/runtime/vm/intermediate_language.h b/runtime/vm/intermediate_language.h index b3bbd0b9fd2..c445a798fae 100644 --- a/runtime/vm/intermediate_language.h +++ b/runtime/vm/intermediate_language.h @@ -177,7 +177,7 @@ class Range; V(_TypedList, get:length, TypedDataLength, 26646119) \ V(_GrowableList, get:length, GrowableArrayLength, 1654255033) \ V(_StringBase, get:length, StringBaseLength, 1483549854) \ - V(ListIterator, moveNext, ListIteratorMoveNext, 881367324) \ + V(ListIterator, moveNext, ListIteratorMoveNext, 2062984847) \ V(_GrowableList, get:iterator, GrowableArrayIterator, 1155241039) \ V(_GrowableList, forEach, GrowableArrayForEach, 195359970) \ diff --git a/runtime/vm/isolate_test.cc b/runtime/vm/isolate_test.cc index ee39fb01904..2bb21c798c3 100644 --- a/runtime/vm/isolate_test.cc +++ b/runtime/vm/isolate_test.cc @@ -40,7 +40,7 @@ TEST_CASE(IsolateSpawn) { // Setup the internal library's 'internalPrint' function. // Necessary because asynchronous errors use "print" to print their // stack trace. - Dart_Handle url = NewString("dart:_collection-dev"); + Dart_Handle url = NewString("dart:_internal"); DART_CHECK_VALID(url); Dart_Handle internal_lib = Dart_LookupLibrary(url); DART_CHECK_VALID(internal_lib); diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index efa28b695ab..71114094911 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -8399,8 +8399,8 @@ RawLibrary* Library::CollectionLibrary() { } -RawLibrary* Library::CollectionDevLibrary() { - return Isolate::Current()->object_store()->collection_dev_library(); +RawLibrary* Library::InternalLibrary() { + return Isolate::Current()->object_store()->internal_library(); } diff --git a/runtime/vm/object.h b/runtime/vm/object.h index f093f750e9e..a41379387f8 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -2664,7 +2664,7 @@ class Library : public Object { static RawLibrary* AsyncLibrary(); static RawLibrary* CoreLibrary(); static RawLibrary* CollectionLibrary(); - static RawLibrary* CollectionDevLibrary(); + static RawLibrary* InternalLibrary(); static RawLibrary* IsolateLibrary(); static RawLibrary* MathLibrary(); static RawLibrary* MirrorsLibrary(); diff --git a/runtime/vm/object_store.h b/runtime/vm/object_store.h index 866f62c207b..710572ffd2b 100644 --- a/runtime/vm/object_store.h +++ b/runtime/vm/object_store.h @@ -24,8 +24,8 @@ class ObjectStore { kAsync, kCore, kCollection, - kCollectionDev, kConvert, + kInternal, kIsolate, kMath, kMirrors, @@ -273,10 +273,8 @@ class ObjectStore { RawLibrary* builtin_library() const { return builtin_library_; } RawLibrary* core_library() const { return core_library_; } RawLibrary* collection_library() const { return collection_library_; } - RawLibrary* collection_dev_library() const { - return collection_dev_library_; - } RawLibrary* convert_library() const { return convert_library_; } + RawLibrary* internal_library() const { return internal_library_; } RawLibrary* isolate_library() const { return isolate_library_; } RawLibrary* math_library() const { return math_library_; } RawLibrary* mirrors_library() const { return mirrors_library_; } @@ -292,12 +290,12 @@ class ObjectStore { case kCollection: collection_library_ = value.raw(); break; - case kCollectionDev: - collection_dev_library_ = value.raw(); - break; case kConvert: convert_library_ = value.raw(); break; + case kInternal: + internal_library_ = value.raw(); + break; case kIsolate: isolate_library_ = value.raw(); break; @@ -465,8 +463,8 @@ class ObjectStore { RawLibrary* builtin_library_; RawLibrary* core_library_; RawLibrary* collection_library_; - RawLibrary* collection_dev_library_; RawLibrary* convert_library_; + RawLibrary* internal_library_; RawLibrary* isolate_library_; RawLibrary* math_library_; RawLibrary* mirrors_library_; diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc index 95b9290ecc9..31af429fd35 100644 --- a/runtime/vm/parser.cc +++ b/runtime/vm/parser.cc @@ -9805,9 +9805,9 @@ AstNode* Parser::ParseSymbolLiteral() { } else { ErrorMsg("illegal symbol literal"); } - // Lookup class Symbol from collection_dev library and call the + // Lookup class Symbol from internal library and call the // constructor to create a symbol instance. - const Library& lib = Library::Handle(Library::CollectionDevLibrary()); + const Library& lib = Library::Handle(Library::InternalLibrary()); const Class& symbol_class = Class::Handle(lib.LookupClass(Symbols::Symbol())); ASSERT(!symbol_class.IsNull()); ArgumentListNode* constr_args = new ArgumentListNode(symbol_pos); diff --git a/runtime/vm/symbols.h b/runtime/vm/symbols.h index f9d200e6bf0..f529934d4d9 100644 --- a/runtime/vm/symbols.h +++ b/runtime/vm/symbols.h @@ -273,8 +273,8 @@ class ObjectPointerVisitor; V(DartAsync, "dart:async") \ V(DartCore, "dart:core") \ V(DartCollection, "dart:collection") \ - V(DartCollectionDev, "dart:_collection-dev") \ V(DartConvert, "dart:convert") \ + V(DartInternal, "dart:_internal") \ V(DartIsolate, "dart:isolate") \ V(DartMath, "dart:math") \ V(DartMirrors, "dart:mirrors") \ diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi index 89e10ab9f1d..ddb0db7396e 100644 --- a/runtime/vm/vm.gypi +++ b/runtime/vm/vm.gypi @@ -13,22 +13,22 @@ 'corelib_patch_cc_file': '<(gen_source_dir)/corelib_patch_gen.cc', 'collection_cc_file': '<(gen_source_dir)/collection_gen.cc', 'collection_patch_cc_file': '<(gen_source_dir)/collection_patch_gen.cc', - 'collection_dev_cc_file': '<(gen_source_dir)/collection_dev_gen.cc', - 'collection_dev_patch_cc_file': '<(gen_source_dir)/collection_dev_patch_gen.cc', 'convert_cc_file': '<(gen_source_dir)/convert_gen.cc', 'convert_patch_cc_file': '<(gen_source_dir)/convert_patch_gen.cc', + 'internal_cc_file': '<(gen_source_dir)/internal_gen.cc', + 'internal_patch_cc_file': '<(gen_source_dir)/internal_patch_gen.cc', + 'isolate_cc_file': '<(gen_source_dir)/isolate_gen.cc', + 'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc', 'math_cc_file': '<(gen_source_dir)/math_gen.cc', 'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc', 'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc', 'mirrors_patch_cc_file': '<(gen_source_dir)/mirrors_patch_gen.cc', - 'isolate_cc_file': '<(gen_source_dir)/isolate_gen.cc', - 'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc', - 'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc', - 'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc', 'service_cc_file': '<(gen_source_dir)/service_gen.cc', 'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat', 'snapshot_test_in_dat_file': 'snapshot_test_in.dat', 'snapshot_test_dart_file': 'snapshot_test.dart', + 'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc', + 'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc', }, 'targets': [ { @@ -99,14 +99,14 @@ 'generate_corelib_patch_cc_file#host', 'generate_collection_cc_file#host', 'generate_collection_patch_cc_file#host', - 'generate_collection_dev_cc_file#host', - 'generate_collection_dev_patch_cc_file#host', 'generate_convert_cc_file#host', 'generate_convert_patch_cc_file#host', - 'generate_math_cc_file#host', - 'generate_math_patch_cc_file#host', + 'generate_internal_cc_file#host', + 'generate_internal_patch_cc_file#host', 'generate_isolate_cc_file#host', 'generate_isolate_patch_cc_file#host', + 'generate_math_cc_file#host', + 'generate_math_patch_cc_file#host', 'generate_mirrors_cc_file#host', 'generate_mirrors_patch_cc_file#host', 'generate_typed_data_cc_file#host', @@ -130,14 +130,14 @@ '<(corelib_patch_cc_file)', '<(collection_cc_file)', '<(collection_patch_cc_file)', - '<(collection_dev_cc_file)', - '<(collection_dev_patch_cc_file)', '<(convert_cc_file)', '<(convert_patch_cc_file)', - '<(math_cc_file)', - '<(math_patch_cc_file)', + '<(internal_cc_file)', + '<(internal_patch_cc_file)', '<(isolate_cc_file)', '<(isolate_patch_cc_file)', + '<(math_cc_file)', + '<(math_patch_cc_file)', '<(mirrors_cc_file)', '<(mirrors_patch_cc_file)', '<(typed_data_cc_file)', @@ -206,6 +206,206 @@ }, ] }, + { + 'target_name': 'generate_async_patch_cc_file', + 'type': 'none', + 'toolsets':['host'], + 'includes': [ + # Load the runtime implementation sources. + '../lib/async_sources.gypi', + ], + 'sources/': [ + # Exclude all .[cc|h] files. + # This is only here for reference. Excludes happen after + # variable expansion, so the script has to do its own + # exclude processing of the sources being passed. + ['exclude', '\\.cc|h$'], + ], + 'actions': [ + { + 'action_name': 'generate_async_patch_cc', + 'inputs': [ + '../tools/gen_library_src_paths.py', + '<(libgen_in_cc_file)', + '<@(_sources)', + ], + 'outputs': [ + '<(async_patch_cc_file)', + ], + 'action': [ + 'python', + 'tools/gen_library_src_paths.py', + '--output', '<(async_patch_cc_file)', + '--input_cc', '<(libgen_in_cc_file)', + '--include', 'vm/bootstrap.h', + '--var_name', 'dart::Bootstrap::async_patch_paths_', + '--library_name', 'dart:async', + '<@(_sources)', + ], + 'message': 'Generating ''<(async_patch_cc_file)'' file.' + }, + ] + }, + { + 'target_name': 'generate_collection_cc_file', + 'type': 'none', + 'toolsets':['host'], + 'includes': [ + # Load the shared collection library sources. + '../../sdk/lib/collection/collection_sources.gypi', + ], + 'sources/': [ + # Exclude all .[cc|h] files. + # This is only here for reference. Excludes happen after + # variable expansion, so the script has to do its own + # exclude processing of the sources being passed. + ['exclude', '\\.cc|h$'], + ], + 'actions': [ + { + 'action_name': 'generate_collection_cc', + 'inputs': [ + '../tools/gen_library_src_paths.py', + '<(libgen_in_cc_file)', + '<@(_sources)', + ], + 'outputs': [ + '<(collection_cc_file)', + ], + 'action': [ + 'python', + 'tools/gen_library_src_paths.py', + '--output', '<(collection_cc_file)', + '--input_cc', '<(libgen_in_cc_file)', + '--include', 'vm/bootstrap.h', + '--var_name', 'dart::Bootstrap::collection_source_paths_', + '--library_name', 'dart:collection', + '<@(_sources)', + ], + 'message': 'Generating ''<(collection_cc_file)'' file.' + }, + ] + }, + { + 'target_name': 'generate_collection_patch_cc_file', + 'type': 'none', + 'toolsets':['host'], + 'includes': [ + # Load the runtime implementation sources. + '../lib/collection_sources.gypi', + ], + 'sources/': [ + # Exclude all .[cc|h] files. + # This is only here for reference. Excludes happen after + # variable expansion, so the script has to do its own + # exclude processing of the sources being passed. + ['exclude', '\\.cc|h$'], + ], + 'actions': [ + { + 'action_name': 'generate_collection_patch_cc', + 'inputs': [ + '../tools/gen_library_src_paths.py', + '<(libgen_in_cc_file)', + '<@(_sources)', + ], + 'outputs': [ + '<(collection_patch_cc_file)', + ], + 'action': [ + 'python', + 'tools/gen_library_src_paths.py', + '--output', '<(collection_patch_cc_file)', + '--input_cc', '<(libgen_in_cc_file)', + '--include', 'vm/bootstrap.h', + '--var_name', 'dart::Bootstrap::collection_patch_paths_', + '--library_name', 'dart:collection', + '<@(_sources)', + ], + 'message': 'Generating ''<(collection_patch_cc_file)'' file.' + }, + ] + }, + { + 'target_name': 'generate_convert_cc_file', + 'type': 'none', + 'toolsets':['host'], + 'includes': [ + # Load the shared convert library sources. + '../../sdk/lib/convert/convert_sources.gypi', + ], + 'sources/': [ + # Exclude all .[cc|h] files. + # This is only here for reference. Excludes happen after + # variable expansion, so the script has to do its own + # exclude processing of the sources being passed. + ['exclude', '\\.cc|h$'], + ], + 'actions': [ + { + 'action_name': 'generate_convert_cc', + 'inputs': [ + '../tools/gen_library_src_paths.py', + '<(libgen_in_cc_file)', + '<@(_sources)', + ], + 'outputs': [ + '<(convert_cc_file)', + ], + 'action': [ + 'python', + 'tools/gen_library_src_paths.py', + '--output', '<(convert_cc_file)', + '--input_cc', '<(libgen_in_cc_file)', + '--include', 'vm/bootstrap.h', + '--var_name', 'dart::Bootstrap::convert_source_paths_', + '--library_name', 'dart:convert', + '<@(_sources)', + ], + 'message': 'Generating ''<(convert_cc_file)'' file.' + }, + ] + }, + { + 'target_name': 'generate_convert_patch_cc_file', + 'type': 'none', + 'toolsets':['host'], + 'includes': [ + # Load the shared convert library sources. + '../lib/convert_sources.gypi', + ], + 'sources/': [ + # Exclude all .[cc|h] files. + # This is only here for reference. Excludes happen after + # variable expansion, so the script has to do its own + # exclude processing of the sources being passed. + ['exclude', '\\.cc|h$'], + ], + 'actions': [ + { + 'action_name': 'generate_convert_patch_cc', + 'inputs': [ + '../tools/gen_library_src_paths.py', + '<(libgen_in_cc_file)', + '<@(_sources)', + ], + 'outputs': [ + '<(convert_patch_cc_file)', + ], + 'action': [ + 'python', + 'tools/gen_library_src_paths.py', + '--output', '<(convert_patch_cc_file)', + '--input_cc', '<(libgen_in_cc_file)', + '--include', 'vm/bootstrap.h', + '--var_name', 'dart::Bootstrap::convert_patch_paths_', + '--library_name', 'dart:convert', + '<@(_sources)', + ], + 'message': 'Generating ''<(convert_patch_cc_file)'' file.' + }, + ] + }, { 'target_name': 'generate_corelib_cc_file', 'type': 'none', @@ -287,52 +487,12 @@ ] }, { - 'target_name': 'generate_collection_cc_file', - 'type': 'none', - 'toolsets':['host'], - 'includes': [ - # Load the shared collection library sources. - '../../sdk/lib/collection/collection_sources.gypi', - ], - 'sources/': [ - # Exclude all .[cc|h] files. - # This is only here for reference. Excludes happen after - # variable expansion, so the script has to do its own - # exclude processing of the sources being passed. - ['exclude', '\\.cc|h$'], - ], - 'actions': [ - { - 'action_name': 'generate_collection_cc', - 'inputs': [ - '../tools/gen_library_src_paths.py', - '<(libgen_in_cc_file)', - '<@(_sources)', - ], - 'outputs': [ - '<(collection_cc_file)', - ], - 'action': [ - 'python', - 'tools/gen_library_src_paths.py', - '--output', '<(collection_cc_file)', - '--input_cc', '<(libgen_in_cc_file)', - '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::collection_source_paths_', - '--library_name', 'dart:collection', - '<@(_sources)', - ], - 'message': 'Generating ''<(collection_cc_file)'' file.' - }, - ] - }, - { - 'target_name': 'generate_collection_dev_patch_cc_file', + 'target_name': 'generate_internal_patch_cc_file', 'type': 'none', 'toolsets':['host'], 'includes': [ # Load the runtime implementation sources. - '../lib/collection_dev_sources.gypi', + '../lib/internal_sources.gypi', ], 'sources/': [ # Exclude all .[cc|h] files. @@ -343,36 +503,36 @@ ], 'actions': [ { - 'action_name': 'generate_collection_dev_patch_cc', + 'action_name': 'generate_internal_patch_cc', 'inputs': [ '../tools/gen_library_src_paths.py', '<(libgen_in_cc_file)', '<@(_sources)', ], 'outputs': [ - '<(collection_dev_patch_cc_file)', + '<(internal_patch_cc_file)', ], 'action': [ 'python', 'tools/gen_library_src_paths.py', - '--output', '<(collection_dev_patch_cc_file)', + '--output', '<(internal_patch_cc_file)', '--input_cc', '<(libgen_in_cc_file)', '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::collection_dev_patch_paths_', - '--library_name', 'dart:_collection-dev', + '--var_name', 'dart::Bootstrap::internal_patch_paths_', + '--library_name', 'dart:_internal', '<@(_sources)', ], - 'message': 'Generating ''<(collection_dev_patch_cc_file)'' file.' + 'message': 'Generating ''<(internal_patch_cc_file)'' file.' }, ] }, { - 'target_name': 'generate_collection_dev_cc_file', + 'target_name': 'generate_internal_cc_file', 'type': 'none', 'toolsets':['host'], 'includes': [ - # Load the shared collection_dev library sources. - '../../sdk/lib/_collection_dev/collection_dev_sources.gypi', + # Load the shared internal library sources. + '../../sdk/lib/internal/internal_sources.gypi', ], 'sources/': [ # Exclude all .[cc|h] files. @@ -383,36 +543,36 @@ ], 'actions': [ { - 'action_name': 'generate_collection_dev_cc', + 'action_name': 'generate_internal_cc', 'inputs': [ '../tools/gen_library_src_paths.py', '<(libgen_in_cc_file)', '<@(_sources)', ], 'outputs': [ - '<(collection_dev_cc_file)', + '<(internal_cc_file)', ], 'action': [ 'python', 'tools/gen_library_src_paths.py', - '--output', '<(collection_dev_cc_file)', + '--output', '<(internal_cc_file)', '--input_cc', '<(libgen_in_cc_file)', '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::collection_dev_source_paths_', - '--library_name', 'dart:_collection-dev', + '--var_name', 'dart::Bootstrap::internal_source_paths_', + '--library_name', 'dart:_internal', '<@(_sources)', ], - 'message': 'Generating ''<(collection_dev_cc_file)'' file.' + 'message': 'Generating ''<(internal_cc_file)'' file.' }, ] }, { - 'target_name': 'generate_convert_cc_file', + 'target_name': 'generate_isolate_cc_file', 'type': 'none', 'toolsets':['host'], 'includes': [ - # Load the shared convert library sources. - '../../sdk/lib/convert/convert_sources.gypi', + # Load the runtime implementation sources. + '../../sdk/lib/isolate/isolate_sources.gypi', ], 'sources/': [ # Exclude all .[cc|h] files. @@ -423,36 +583,36 @@ ], 'actions': [ { - 'action_name': 'generate_convert_cc', + 'action_name': 'generate_isolate_cc', 'inputs': [ '../tools/gen_library_src_paths.py', '<(libgen_in_cc_file)', '<@(_sources)', ], 'outputs': [ - '<(convert_cc_file)', + '<(isolate_cc_file)', ], 'action': [ 'python', 'tools/gen_library_src_paths.py', - '--output', '<(convert_cc_file)', + '--output', '<(isolate_cc_file)', '--input_cc', '<(libgen_in_cc_file)', '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::convert_source_paths_', - '--library_name', 'dart:convert', + '--var_name', 'dart::Bootstrap::isolate_source_paths_', + '--library_name', 'dart:isolate', '<@(_sources)', ], - 'message': 'Generating ''<(convert_cc_file)'' file.' + 'message': 'Generating ''<(isolate_cc_file)'' file.' }, ] }, { - 'target_name': 'generate_convert_patch_cc_file', + 'target_name': 'generate_isolate_patch_cc_file', 'type': 'none', 'toolsets':['host'], 'includes': [ - # Load the shared convert library sources. - '../lib/convert_sources.gypi', + # Load the runtime implementation sources. + '../lib/isolate_sources.gypi', ], 'sources/': [ # Exclude all .[cc|h] files. @@ -463,26 +623,26 @@ ], 'actions': [ { - 'action_name': 'generate_convert_patch_cc', + 'action_name': 'generate_isolate_patch_cc', 'inputs': [ '../tools/gen_library_src_paths.py', '<(libgen_in_cc_file)', '<@(_sources)', ], 'outputs': [ - '<(convert_patch_cc_file)', + '<(isolate_patch_cc_file)', ], 'action': [ 'python', 'tools/gen_library_src_paths.py', - '--output', '<(convert_patch_cc_file)', + '--output', '<(isolate_patch_cc_file)', '--input_cc', '<(libgen_in_cc_file)', '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::convert_patch_paths_', - '--library_name', 'dart:convert', + '--var_name', 'dart::Bootstrap::isolate_patch_paths_', + '--library_name', 'dart:isolate', '<@(_sources)', ], - 'message': 'Generating ''<(convert_patch_cc_file)'' file.' + 'message': 'Generating ''<(isolate_patch_cc_file)'' file.' }, ] }, @@ -646,166 +806,6 @@ }, ] }, - { - 'target_name': 'generate_isolate_cc_file', - 'type': 'none', - 'toolsets':['host'], - 'includes': [ - # Load the runtime implementation sources. - '../../sdk/lib/isolate/isolate_sources.gypi', - ], - 'sources/': [ - # Exclude all .[cc|h] files. - # This is only here for reference. Excludes happen after - # variable expansion, so the script has to do its own - # exclude processing of the sources being passed. - ['exclude', '\\.cc|h$'], - ], - 'actions': [ - { - 'action_name': 'generate_isolate_cc', - 'inputs': [ - '../tools/gen_library_src_paths.py', - '<(libgen_in_cc_file)', - '<@(_sources)', - ], - 'outputs': [ - '<(isolate_cc_file)', - ], - 'action': [ - 'python', - 'tools/gen_library_src_paths.py', - '--output', '<(isolate_cc_file)', - '--input_cc', '<(libgen_in_cc_file)', - '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::isolate_source_paths_', - '--library_name', 'dart:isolate', - '<@(_sources)', - ], - 'message': 'Generating ''<(isolate_cc_file)'' file.' - }, - ] - }, - { - 'target_name': 'generate_async_patch_cc_file', - 'type': 'none', - 'toolsets':['host'], - 'includes': [ - # Load the runtime implementation sources. - '../lib/async_sources.gypi', - ], - 'sources/': [ - # Exclude all .[cc|h] files. - # This is only here for reference. Excludes happen after - # variable expansion, so the script has to do its own - # exclude processing of the sources being passed. - ['exclude', '\\.cc|h$'], - ], - 'actions': [ - { - 'action_name': 'generate_async_patch_cc', - 'inputs': [ - '../tools/gen_library_src_paths.py', - '<(libgen_in_cc_file)', - '<@(_sources)', - ], - 'outputs': [ - '<(async_patch_cc_file)', - ], - 'action': [ - 'python', - 'tools/gen_library_src_paths.py', - '--output', '<(async_patch_cc_file)', - '--input_cc', '<(libgen_in_cc_file)', - '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::async_patch_paths_', - '--library_name', 'dart:async', - '<@(_sources)', - ], - 'message': 'Generating ''<(async_patch_cc_file)'' file.' - }, - ] - }, - { - 'target_name': 'generate_collection_patch_cc_file', - 'type': 'none', - 'toolsets':['host'], - 'includes': [ - # Load the runtime implementation sources. - '../lib/collection_sources.gypi', - ], - 'sources/': [ - # Exclude all .[cc|h] files. - # This is only here for reference. Excludes happen after - # variable expansion, so the script has to do its own - # exclude processing of the sources being passed. - ['exclude', '\\.cc|h$'], - ], - 'actions': [ - { - 'action_name': 'generate_collection_patch_cc', - 'inputs': [ - '../tools/gen_library_src_paths.py', - '<(libgen_in_cc_file)', - '<@(_sources)', - ], - 'outputs': [ - '<(collection_patch_cc_file)', - ], - 'action': [ - 'python', - 'tools/gen_library_src_paths.py', - '--output', '<(collection_patch_cc_file)', - '--input_cc', '<(libgen_in_cc_file)', - '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::collection_patch_paths_', - '--library_name', 'dart:collection', - '<@(_sources)', - ], - 'message': 'Generating ''<(collection_patch_cc_file)'' file.' - }, - ] - }, - { - 'target_name': 'generate_isolate_patch_cc_file', - 'type': 'none', - 'toolsets':['host'], - 'includes': [ - # Load the runtime implementation sources. - '../lib/isolate_sources.gypi', - ], - 'sources/': [ - # Exclude all .[cc|h] files. - # This is only here for reference. Excludes happen after - # variable expansion, so the script has to do its own - # exclude processing of the sources being passed. - ['exclude', '\\.cc|h$'], - ], - 'actions': [ - { - 'action_name': 'generate_isolate_patch_cc', - 'inputs': [ - '../tools/gen_library_src_paths.py', - '<(libgen_in_cc_file)', - '<@(_sources)', - ], - 'outputs': [ - '<(isolate_patch_cc_file)', - ], - 'action': [ - 'python', - 'tools/gen_library_src_paths.py', - '--output', '<(isolate_patch_cc_file)', - '--input_cc', '<(libgen_in_cc_file)', - '--include', 'vm/bootstrap.h', - '--var_name', 'dart::Bootstrap::isolate_patch_paths_', - '--library_name', 'dart:isolate', - '<@(_sources)', - ], - 'message': 'Generating ''<(isolate_patch_cc_file)'' file.' - }, - ] - }, { 'target_name': 'generate_typed_data_cc_file', 'type': 'none', diff --git a/sdk/lib/_internal/compiler/implementation/compiler.dart b/sdk/lib/_internal/compiler/implementation/compiler.dart index a49913157ca..417ed7b356a 100644 --- a/sdk/lib/_internal/compiler/implementation/compiler.dart +++ b/sdk/lib/_internal/compiler/implementation/compiler.dart @@ -452,7 +452,7 @@ abstract class Compiler implements DiagnosticListener { // Initialized after mirrorSystemClass has been resolved. FunctionElement mirrorSystemGetNameFunction; - // Initialized when dart:_collection-dev is loaded. + // Initialized when dart:_internal is loaded. ClassElement symbolImplementationClass; // Initialized when symbolImplementationClass has been resolved. @@ -809,7 +809,7 @@ abstract class Compiler implements DiagnosticListener { typedDataLibrary = library; typedDataClass = findRequiredElement(library, 'TypedData'); - } else if (uri == new Uri(scheme: 'dart', path: '_collection-dev')) { + } else if (uri == new Uri(scheme: 'dart', path: '_internal')) { symbolImplementationClass = findRequiredElement(library, 'Symbol'); } else if (uri == new Uri(scheme: 'dart', path: 'async')) { diff --git a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart index 4128afe1d9c..56bf967f898 100644 --- a/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart +++ b/sdk/lib/_internal/compiler/implementation/js_backend/backend.dart @@ -1569,7 +1569,7 @@ class JavaScriptBackend extends Backend { /// Called when resolving the `Symbol` constructor. void registerSymbolConstructor(TreeElements elements) { - // Make sure that collection_dev.Symbol.validated is registered. + // Make sure that _internals.Symbol.validated is registered. assert(compiler.symbolValidatedConstructor != null); enqueueInResolution(compiler.symbolValidatedConstructor, elements); } diff --git a/sdk/lib/_internal/lib/core_patch.dart b/sdk/lib/_internal/lib/core_patch.dart index b4a7bd2ebaf..30aa9264d8b 100644 --- a/sdk/lib/_internal/lib/core_patch.dart +++ b/sdk/lib/_internal/lib/core_patch.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. // Patch file for dart:core classes. -import "dart:_collection-dev" as _symbol_dev; +import "dart:_internal" as _symbol_dev; import 'dart:_interceptors'; import 'dart:_js_helper' show checkNull, getRuntimeType, diff --git a/sdk/lib/_internal/lib/interceptors.dart b/sdk/lib/_internal/lib/interceptors.dart index 1562b5775d3..6b256288f7e 100644 --- a/sdk/lib/_internal/lib/interceptors.dart +++ b/sdk/lib/_internal/lib/interceptors.dart @@ -5,8 +5,8 @@ library _interceptors; import 'dart:collection'; -import 'dart:_collection-dev' hide Symbol; -import "dart:_collection-dev" as _symbol_dev show Symbol; +import 'dart:_internal' hide Symbol; +import "dart:_internal" as _symbol_dev show Symbol; import 'dart:_js_helper' show allMatchesInStringUnchecked, Null, JSSyntaxRegExp, diff --git a/sdk/lib/_internal/lib/collection_dev_patch.dart b/sdk/lib/_internal/lib/internal_patch.dart similarity index 99% rename from sdk/lib/_internal/lib/collection_dev_patch.dart rename to sdk/lib/_internal/lib/internal_patch.dart index cd766c48d6f..cccc6569f5e 100644 --- a/sdk/lib/_internal/lib/collection_dev_patch.dart +++ b/sdk/lib/_internal/lib/internal_patch.dart @@ -11,4 +11,4 @@ patch class Symbol implements core.Symbol { patch void printToConsole(String line) { printString('$line'); -} +} \ No newline at end of file diff --git a/sdk/lib/_internal/lib/js_helper.dart b/sdk/lib/_internal/lib/js_helper.dart index bc490dd982e..e7bde649eff 100644 --- a/sdk/lib/_internal/lib/js_helper.dart +++ b/sdk/lib/_internal/lib/js_helper.dart @@ -33,8 +33,8 @@ import 'dart:_foreign_helper' show RAW_DART_FUNCTION_REF; import 'dart:_interceptors'; -import 'dart:_collection-dev' as _symbol_dev; -import 'dart:_collection-dev' show MappedIterable; +import 'dart:_internal' as _symbol_dev; +import 'dart:_internal' show MappedIterable; import 'dart:_js_names' show extractKeys, diff --git a/sdk/lib/_internal/lib/js_mirrors.dart b/sdk/lib/_internal/lib/js_mirrors.dart index 4740db90e2e..c55da2a7063 100644 --- a/sdk/lib/_internal/lib/js_mirrors.dart +++ b/sdk/lib/_internal/lib/js_mirrors.dart @@ -17,7 +17,7 @@ import 'dart:_foreign_helper' show JS_CURRENT_ISOLATE_CONTEXT, JS_GET_NAME; -import 'dart:_collection-dev' as _symbol_dev; +import 'dart:_internal' as _symbol_dev; import 'dart:_js_helper' show BoundClosure, diff --git a/sdk/lib/_internal/libraries.dart b/sdk/lib/_internal/libraries.dart index 7135991af46..fd6e338d040 100644 --- a/sdk/lib/_internal/libraries.dart +++ b/sdk/lib/_internal/libraries.dart @@ -130,12 +130,12 @@ const Map LIBRARIES = const { maturity: Maturity.WEB_STABLE, dart2jsPath: "web_sql/dart2js/web_sql_dart2js.dart"), - "_collection-dev": const LibraryInfo( - "_collection_dev/collection_dev.dart", + "_internal": const LibraryInfo( + "internal/internal.dart", category: "Internal", documented: false, dart2jsPatchPath: - "_internal/lib/collection_dev_patch.dart"), + "_internal/lib/internal_patch.dart"), "_js_helper": const LibraryInfo( "_internal/lib/js_helper.dart", diff --git a/sdk/lib/async/async.dart b/sdk/lib/async/async.dart index b8d5eb0fb4c..7de40e683c7 100644 --- a/sdk/lib/async/async.dart +++ b/sdk/lib/async/async.dart @@ -89,7 +89,7 @@ library dart.async; import "dart:collection"; -import "dart:_collection-dev" show deprecated, printToZone, printToConsole; +import "dart:_internal" show deprecated, printToZone, printToConsole; part 'async_error.dart'; part 'broadcast_stream_controller.dart'; diff --git a/sdk/lib/collection/collection.dart b/sdk/lib/collection/collection.dart index 54085f703cc..4620bc08616 100644 --- a/sdk/lib/collection/collection.dart +++ b/sdk/lib/collection/collection.dart @@ -7,7 +7,7 @@ */ library dart.collection; -import 'dart:_collection-dev'; +import 'dart:_internal'; import 'dart:math' show Random; // Used by ListMixin.shuffle. part 'collections.dart'; diff --git a/sdk/lib/core/core.dart b/sdk/lib/core/core.dart index 65f888e8a10..f7899871e92 100644 --- a/sdk/lib/core/core.dart +++ b/sdk/lib/core/core.dart @@ -153,8 +153,8 @@ library dart.core; import "dart:collection"; -import "dart:_collection-dev" hide Symbol; -import "dart:_collection-dev" as _collection_dev; +import "dart:_internal" hide Symbol; +import "dart:_internal" as internal show Symbol; import "dart:convert" show UTF8, LATIN1, Encoding; import "dart:math" show Random; // Used by List.shuffle. diff --git a/sdk/lib/core/symbol.dart b/sdk/lib/core/symbol.dart index c45fcf502d3..c92001af498 100644 --- a/sdk/lib/core/symbol.dart +++ b/sdk/lib/core/symbol.dart @@ -20,5 +20,5 @@ class Symbol { * possible, use [MirrorsUsed] in "dart:mirrors" to specify which names might * be passed to this constructor. */ - const factory Symbol(String name) = _collection_dev.Symbol; + const factory Symbol(String name) = internal.Symbol; } diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart index bf95296b0f4..9ca995843e8 100644 --- a/sdk/lib/html/dart2js/html_dart2js.dart +++ b/sdk/lib/html/dart2js/html_dart2js.dart @@ -26,7 +26,7 @@ library dart.dom.html; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide Symbol, deprecated; +import 'dart:_internal' hide Symbol, deprecated; import 'dart:html_common'; import 'dart:indexed_db'; import 'dart:isolate'; diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart index 59818c96d57..4e3f00fffcd 100644 --- a/sdk/lib/html/dartium/html_dartium.dart +++ b/sdk/lib/html/dartium/html_dartium.dart @@ -26,7 +26,7 @@ library dart.dom.html; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide Symbol, deprecated; +import 'dart:_internal' hide Symbol, deprecated; import 'dart:html_common'; import 'dart:indexed_db'; import 'dart:isolate'; @@ -28969,13 +28969,13 @@ class Url extends NativeFieldWrapperClass2 implements UrlUtils { if ((blob_OR_source_OR_stream is Blob || blob_OR_source_OR_stream == null)) { return _createObjectURL_1(blob_OR_source_OR_stream); } - if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) { + if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) { return _createObjectURL_2(blob_OR_source_OR_stream); } - if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) { + if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) { return _createObjectURL_3(blob_OR_source_OR_stream); } - if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) { + if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) { return _createObjectURL_4(blob_OR_source_OR_stream); } throw new ArgumentError("Incorrect number or type of arguments"); diff --git a/sdk/lib/_collection_dev/collection_dev.dart b/sdk/lib/internal/internal.dart similarity index 93% rename from sdk/lib/_collection_dev/collection_dev.dart rename to sdk/lib/internal/internal.dart index 9902b0e4c38..2d41870b657 100644 --- a/sdk/lib/_collection_dev/collection_dev.dart +++ b/sdk/lib/internal/internal.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. -library dart._collection.dev; +library dart._internal; import 'dart:collection'; diff --git a/sdk/lib/_collection_dev/collection_dev_sources.gypi b/sdk/lib/internal/internal_sources.gypi similarity index 81% rename from sdk/lib/_collection_dev/collection_dev_sources.gypi rename to sdk/lib/internal/internal_sources.gypi index bb257427022..17cc2870396 100644 --- a/sdk/lib/_collection_dev/collection_dev_sources.gypi +++ b/sdk/lib/internal/internal_sources.gypi @@ -2,10 +2,10 @@ # 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. -# This file contains all sources for the dart:collection-dev library. +# This file contains all sources for the dart:_internal library. { 'sources': [ - 'collection_dev.dart', + 'internal.dart', # The above file needs to be first as it lists the parts below. 'iterable.dart', 'list.dart', diff --git a/sdk/lib/_collection_dev/iterable.dart b/sdk/lib/internal/iterable.dart similarity index 99% rename from sdk/lib/_collection_dev/iterable.dart rename to sdk/lib/internal/iterable.dart index 4bcc7b8c6b7..85c505c8eef 100644 --- a/sdk/lib/_collection_dev/iterable.dart +++ b/sdk/lib/internal/iterable.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. -part of dart._collection.dev; +part of dart._internal; /** * Marker interface for [Iterable] subclasses that have an efficient diff --git a/sdk/lib/_collection_dev/list.dart b/sdk/lib/internal/list.dart similarity index 99% rename from sdk/lib/_collection_dev/list.dart rename to sdk/lib/internal/list.dart index e8929defcf9..14eeb1372ee 100644 --- a/sdk/lib/_collection_dev/list.dart +++ b/sdk/lib/internal/list.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. -part of dart._collection.dev; +part of dart._internal; /** * Mixin that throws on the length changing operations of [List]. diff --git a/sdk/lib/_collection_dev/lists.dart b/sdk/lib/internal/lists.dart similarity index 98% rename from sdk/lib/_collection_dev/lists.dart rename to sdk/lib/internal/lists.dart index eed1df59902..f821616bd63 100644 --- a/sdk/lib/_collection_dev/lists.dart +++ b/sdk/lib/internal/lists.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. -part of dart._collection.dev; +part of dart._internal; class Lists { static void copy(List src, int srcStart, diff --git a/sdk/lib/_collection_dev/print.dart b/sdk/lib/internal/print.dart similarity index 94% rename from sdk/lib/_collection_dev/print.dart rename to sdk/lib/internal/print.dart index 0c7182e0ad3..c3e23b827cc 100644 --- a/sdk/lib/_collection_dev/print.dart +++ b/sdk/lib/internal/print.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. -part of dart._collection.dev; +part of dart._internal; /** * This function is set by the first allocation of a Zone. diff --git a/sdk/lib/_collection_dev/sort.dart b/sdk/lib/internal/sort.dart similarity index 99% rename from sdk/lib/_collection_dev/sort.dart rename to sdk/lib/internal/sort.dart index 9bc7c9abfad..562d8b834bd 100644 --- a/sdk/lib/_collection_dev/sort.dart +++ b/sdk/lib/internal/sort.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. -part of dart._collection.dev; +part of dart._internal; /** * Dual-Pivot Quicksort algorithm. diff --git a/sdk/lib/_collection_dev/symbol.dart b/sdk/lib/internal/symbol.dart similarity index 98% rename from sdk/lib/_collection_dev/symbol.dart rename to sdk/lib/internal/symbol.dart index 87517bad2b2..7a0369a9a56 100644 --- a/sdk/lib/_collection_dev/symbol.dart +++ b/sdk/lib/internal/symbol.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. -part of dart._collection.dev; +part of dart._internal; /** * Implementation of [core.Symbol]. This class uses the same name as diff --git a/sdk/lib/io/io.dart b/sdk/lib/io/io.dart index d0c1f58e11d..59b06974b08 100644 --- a/sdk/lib/io/io.dart +++ b/sdk/lib/io/io.dart @@ -196,7 +196,7 @@ library dart.io; import 'dart:async'; -import 'dart:_collection-dev'; +import 'dart:_internal'; import 'dart:collection' show HashMap, HashSet, LinkedList, diff --git a/sdk/lib/svg/dart2js/svg_dart2js.dart b/sdk/lib/svg/dart2js/svg_dart2js.dart index 2c276251d4e..13d4234dd3a 100644 --- a/sdk/lib/svg/dart2js/svg_dart2js.dart +++ b/sdk/lib/svg/dart2js/svg_dart2js.dart @@ -10,7 +10,7 @@ library dart.dom.svg; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:_js_helper' show Creates, Returns, JSName; diff --git a/sdk/lib/svg/dartium/svg_dartium.dart b/sdk/lib/svg/dartium/svg_dartium.dart index 8c5c3b7185c..e257800407e 100644 --- a/sdk/lib/svg/dartium/svg_dartium.dart +++ b/sdk/lib/svg/dartium/svg_dartium.dart @@ -2,7 +2,7 @@ library dart.dom.svg; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart b/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart index c237962a66a..92716d97732 100644 --- a/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart +++ b/sdk/lib/typed_data/dart2js/typed_data_dart2js.dart @@ -9,7 +9,7 @@ library dart.typed_data; import 'dart:collection'; -import 'dart:_collection-dev'; +import 'dart:_internal'; import 'dart:_interceptors' show JSIndexable, JSUInt32, JSUInt31; import 'dart:_js_helper' show Creates, JavaScriptIndexingBehavior, JSName, Null, Returns; diff --git a/sdk/lib/typed_data/typed_data.dart b/sdk/lib/typed_data/typed_data.dart index 9d37eb68307..413eff3a385 100644 --- a/sdk/lib/typed_data/typed_data.dart +++ b/sdk/lib/typed_data/typed_data.dart @@ -5,8 +5,6 @@ library dart.typed_data; import 'dart:collection'; -import 'dart:_collection-dev'; -import 'dart:math' show Random; /** * A sequence of bytes underlying a typed data object. diff --git a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart index b0007ed18b7..b3e88e920e1 100644 --- a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart +++ b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart @@ -5,7 +5,7 @@ library dart.dom.web_audio; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:typed_data'; diff --git a/sdk/lib/web_audio/dartium/web_audio_dartium.dart b/sdk/lib/web_audio/dartium/web_audio_dartium.dart index 47e84fea360..8e581b0d5b7 100644 --- a/sdk/lib/web_audio/dartium/web_audio_dartium.dart +++ b/sdk/lib/web_audio/dartium/web_audio_dartium.dart @@ -2,7 +2,7 @@ library dart.dom.web_audio; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart index 4416a725e06..d0d67a3a3c6 100644 --- a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart +++ b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart @@ -4,7 +4,7 @@ library dart.dom.web_gl; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:typed_data'; diff --git a/sdk/lib/web_gl/dartium/web_gl_dartium.dart b/sdk/lib/web_gl/dartium/web_gl_dartium.dart index a3c428694fc..e19200f1403 100644 --- a/sdk/lib/web_gl/dartium/web_gl_dartium.dart +++ b/sdk/lib/web_gl/dartium/web_gl_dartium.dart @@ -2,7 +2,7 @@ library dart.dom.web_gl; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart index 668bdeff600..de33d88e017 100644 --- a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart +++ b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart @@ -12,7 +12,7 @@ library dart.dom.web_sql; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:_js_helper' show convertDartClosureToJS, Creates, JSName; diff --git a/sdk/lib/web_sql/dartium/web_sql_dartium.dart b/sdk/lib/web_sql/dartium/web_sql_dartium.dart index 62f24976fb6..5917aeff7de 100644 --- a/sdk/lib/web_sql/dartium/web_sql_dartium.dart +++ b/sdk/lib/web_sql/dartium/web_sql_dartium.dart @@ -12,7 +12,7 @@ library dart.dom.web_sql; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/tests/language/import_private_test.dart b/tests/language/import_private_test.dart index e269c7aa0e0..85eccde9718 100644 --- a/tests/language/import_private_test.dart +++ b/tests/language/import_private_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. // Check that private dart:_ libraries cannot be imported. -import "dart:_collection-dev"; /// 01: compile-time error +import "dart:_internal"; /// 01: compile-time error main() { print("Done."); diff --git a/tools/create_sdk.py b/tools/create_sdk.py index 5261e7170e9..f32d5522165 100755 --- a/tools/create_sdk.py +++ b/tools/create_sdk.py @@ -30,10 +30,10 @@ # ......_internal/ # ......async/ # ......collection/ -# ......_collection_dev/ # ......convert/ # ......core/ # ......html/ +# ......internal/ # ......io/ # ......isolate/ # ......js/ @@ -196,8 +196,8 @@ def Main(argv): join('_internal', 'compiler'), join('_internal', 'dartdoc'), join('_internal', 'lib'), - 'async', 'collection', '_collection_dev', 'convert', - 'core', 'crypto', 'io', 'isolate', + 'async', 'collection', 'convert', 'core', + 'crypto', 'internal', 'io', 'isolate', join('html', 'dart2js'), join('html', 'dartium'), join('html', 'html_common'), join('indexed_db', 'dart2js'), join('indexed_db', 'dartium'), diff --git a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate index 4f20f1c6267..0062f83e73c 100644 --- a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate +++ b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate @@ -34,7 +34,7 @@ library dart.dom.html; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide Symbol, deprecated; +import 'dart:_internal' hide Symbol, deprecated; import 'dart:html_common'; import 'dart:indexed_db'; import 'dart:isolate'; diff --git a/tools/dom/templates/html/dart2js/svg_dart2js.darttemplate b/tools/dom/templates/html/dart2js/svg_dart2js.darttemplate index df8a3040de0..3e4e1682bcb 100644 --- a/tools/dom/templates/html/dart2js/svg_dart2js.darttemplate +++ b/tools/dom/templates/html/dart2js/svg_dart2js.darttemplate @@ -14,7 +14,7 @@ library dart.dom.svg; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:_js_helper' show Creates, Returns, JSName; diff --git a/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate b/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate index 7cb895e51ff..0c00c7698fe 100644 --- a/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate +++ b/tools/dom/templates/html/dart2js/web_audio_dart2js.darttemplate @@ -9,7 +9,7 @@ library dart.dom.web_audio; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:typed_data'; diff --git a/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate b/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate index 147f61c27a9..75007827589 100644 --- a/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate +++ b/tools/dom/templates/html/dart2js/web_gl_dart2js.darttemplate @@ -8,7 +8,7 @@ library dart.dom.web_gl; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:typed_data'; diff --git a/tools/dom/templates/html/dart2js/web_sql_dart2js.darttemplate b/tools/dom/templates/html/dart2js/web_sql_dart2js.darttemplate index 9c79d0d6b4d..c6c9bcf0a62 100644 --- a/tools/dom/templates/html/dart2js/web_sql_dart2js.darttemplate +++ b/tools/dom/templates/html/dart2js/web_sql_dart2js.darttemplate @@ -16,7 +16,7 @@ library dart.dom.web_sql; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:_js_helper' show convertDartClosureToJS, Creates, JSName; diff --git a/tools/dom/templates/html/dartium/html_dartium.darttemplate b/tools/dom/templates/html/dartium/html_dartium.darttemplate index 5ea3aa344b5..2c92c8c241d 100644 --- a/tools/dom/templates/html/dartium/html_dartium.darttemplate +++ b/tools/dom/templates/html/dartium/html_dartium.darttemplate @@ -33,7 +33,7 @@ library dart.dom.html; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide Symbol, deprecated; +import 'dart:_internal' hide Symbol, deprecated; import 'dart:html_common'; import 'dart:indexed_db'; import 'dart:isolate'; diff --git a/tools/dom/templates/html/dartium/svg_dartium.darttemplate b/tools/dom/templates/html/dartium/svg_dartium.darttemplate index 66b9873b46e..bee159620ae 100644 --- a/tools/dom/templates/html/dartium/svg_dartium.darttemplate +++ b/tools/dom/templates/html/dartium/svg_dartium.darttemplate @@ -5,7 +5,7 @@ library dart.dom.svg; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate b/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate index d2457d02f1d..0f9bdbd89b2 100644 --- a/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate +++ b/tools/dom/templates/html/dartium/web_audio_dartium.darttemplate @@ -5,7 +5,7 @@ library dart.dom.web_audio; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate b/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate index f651502739c..c441c01acc3 100644 --- a/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate +++ b/tools/dom/templates/html/dartium/web_gl_dartium.darttemplate @@ -5,7 +5,7 @@ library dart.dom.web_gl; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers'; diff --git a/tools/dom/templates/html/dartium/web_sql_dartium.darttemplate b/tools/dom/templates/html/dartium/web_sql_dartium.darttemplate index eb973225b24..23eafeb43c3 100644 --- a/tools/dom/templates/html/dartium/web_sql_dartium.darttemplate +++ b/tools/dom/templates/html/dartium/web_sql_dartium.darttemplate @@ -16,7 +16,7 @@ library dart.dom.web_sql; import 'dart:async'; import 'dart:collection'; -import 'dart:_collection-dev' hide deprecated; +import 'dart:_internal' hide deprecated; import 'dart:html'; import 'dart:html_common'; import 'dart:nativewrappers';