From 22d0696d91f201cabd2945fde13da9d0f10942c9 Mon Sep 17 00:00:00 2001 From: Jens Johansen Date: Fri, 1 Dec 2017 08:42:16 +0000 Subject: [PATCH] [CFE] Move front-end API under src/ This CL deprecates the front-end API and moves it into src/api_prototype. For now all usages have been updated to point to the new location, but they should be updated to use custom-client invocations instead (e.g. one specific way for DDC, another for dart2js etc.) Bug: Change-Id: I9b4f41f6ebf55d42510fd35240d942d1dc7292d6 Reviewed-on: https://dart-review.googlesource.com/24822 Commit-Queue: Jens Johansen Reviewed-by: Kevin Millikin --- .../lib/src/analysis_server.dart | 2 +- .../test/abstract_context.dart | 2 +- .../test/context_manager_test.dart | 2 +- .../services/search/search_engine_test.dart | 2 +- .../test/src/plugin/plugin_watcher_test.dart | 2 +- pkg/analyzer/lib/src/context/builder.dart | 2 +- .../lib/src/dart/analysis/byte_store.dart | 2 +- .../lib/src/dart/analysis/driver.dart | 2 +- .../src/dart/analysis/file_byte_store.dart | 2 +- .../lib/src/dart/analysis/file_state.dart | 2 +- .../dart/analysis/frontend_resolution.dart | 2 +- .../lib/src/dart/analysis/kernel_context.dart | 6 ++-- .../src/dart/analysis/library_context.dart | 2 +- pkg/analyzer/lib/src/lint/analysis.dart | 2 +- .../test/generated/resolver_test_case.dart | 2 +- pkg/analyzer/test/src/dart/analysis/base.dart | 2 +- .../test/src/dart/analysis/driver_test.dart | 2 +- .../src/dart/analysis/file_state_test.dart | 2 +- .../src/summary/resynthesize_kernel_test.dart | 6 ++-- .../src/task/strong/strong_test_helper.dart | 2 +- .../tool/task_dependency_graph/generate.dart | 2 +- pkg/analyzer_cli/lib/src/build_mode.dart | 2 +- pkg/analyzer_cli/lib/src/driver.dart | 2 +- .../lib/src/kernel/front_end_adapter.dart | 2 +- pkg/compiler/lib/src/library_loader.dart | 2 +- pkg/compiler/tool/generate_kernel.dart | 2 +- pkg/dev_compiler/lib/src/kernel/command.dart | 4 +-- pkg/dev_compiler/tool/build_pkgs.dart | 6 ++-- pkg/dev_compiler/tool/kernel_sdk.dart | 4 +-- .../compiler_with_invalidation.dart | 6 ++-- .../{ => src/api_prototype}/byte_store.dart | 0 .../api_prototype}/compilation_message.dart | 0 .../api_prototype}/compiler_options.dart | 2 +- .../api_prototype}/dependency_grapher.dart | 2 +- .../{ => src/api_prototype}/file_system.dart | 0 .../{ => src/api_prototype}/front_end.dart | 0 .../incremental_kernel_generator.dart | 0 .../api_prototype}/kernel_generator.dart | 10 +++--- .../api_prototype}/memory_file_system.dart | 0 .../api_prototype}/physical_file_system.dart | 0 .../api_prototype}/summary_generator.dart | 4 +-- .../lib/src/base/processed_options.dart | 8 ++--- .../lib/src/dependency_grapher_impl.dart | 4 +-- .../lib/src/fasta/compiler_context.dart | 4 +-- .../lib/src/fasta/get_dependencies.dart | 4 +-- .../lib/src/fasta/kernel/kernel_target.dart | 2 +- .../lib/src/fasta/source/source_loader.dart | 2 +- .../lib/src/fasta/testing/kernel_chain.dart | 2 +- .../lib/src/fasta/uri_translator.dart | 2 +- .../lib/src/incremental/file_state.dart | 4 +-- .../lib/src/incremental/kernel_driver.dart | 4 +-- .../incremental_kernel_generator_impl.dart | 6 ++-- .../lib/src/kernel_generator_impl.dart | 5 +-- .../minimal_incremental_kernel_generator.dart | 4 +-- .../lib/src/multi_root_file_system.dart | 2 +- .../lib/src/testing/compiler_common.dart | 4 +-- .../lib/src/testing/hybrid_file_system.dart | 6 ++-- .../test/dependency_grapher_test.dart | 6 ++-- pkg/front_end/test/fasta/reexport_test.dart | 3 +- pkg/front_end/test/fasta/shaker_test.dart | 2 +- .../test/fasta/testing/analyzer_loader.dart | 2 +- .../test/fasta/testing/analyzer_target.dart | 2 +- pkg/front_end/test/fasta/testing/suite.dart | 6 ++-- .../incremental_kernel_generator_test.dart | 10 +++--- pkg/front_end/test/kernel_generator_test.dart | 2 +- .../test/memory_file_system_test.dart | 5 +-- ...mal_incremental_kernel_generator_test.dart | 10 +++--- pkg/front_end/test/mixin_export_test.dart | 2 +- .../test/physical_file_system_test.dart | 4 +-- .../test/src/base/processed_options_test.dart | 4 +-- .../test/src/incremental/file_state_test.dart | 4 +-- .../src/incremental/hot_reload_e2e_test.dart | 10 +++--- .../src/incremental/kernel_driver_test.dart | 8 ++--- .../test/src/incremental/mock_sdk.dart | 2 +- .../test/src/multi_root_file_system_test.dart | 2 +- .../test/subpackage_relationships_test.dart | 34 +++++++++---------- .../test/summary_generator_test.dart | 2 +- pkg/front_end/tool/_fasta/bulk_compile.dart | 8 +++-- .../tool/_fasta/bulk_compile_test.dart | 3 +- pkg/front_end/tool/_fasta/command_line.dart | 3 +- pkg/front_end/tool/bazel/worker.dart | 3 +- pkg/front_end/tool/example.dart | 4 +-- pkg/front_end/tool/fasta_perf.dart | 2 +- pkg/front_end/tool/fasta_perf_test.dart | 3 +- pkg/front_end/tool/incremental_perf.dart | 13 +++---- pkg/front_end/tool/perf_common.dart | 2 +- pkg/front_end/tool/perf_test.dart | 3 +- pkg/vm/bin/kernel_service.dart | 10 +++--- pkg/vm/lib/kernel_front_end.dart | 5 +-- tests/compiler/dart2js/dill_loader_test.dart | 2 +- tools/patch_sdk.dart | 2 +- 91 files changed, 179 insertions(+), 165 deletions(-) rename pkg/front_end/lib/{ => src/api_prototype}/byte_store.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/compilation_message.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/compiler_options.dart (99%) rename pkg/front_end/lib/{ => src/api_prototype}/dependency_grapher.dart (96%) rename pkg/front_end/lib/{ => src/api_prototype}/file_system.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/front_end.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/incremental_kernel_generator.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/kernel_generator.dart (94%) rename pkg/front_end/lib/{ => src/api_prototype}/memory_file_system.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/physical_file_system.dart (100%) rename pkg/front_end/lib/{ => src/api_prototype}/summary_generator.dart (95%) diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart index 4002f8fdeec..2df2b21a5d5 100644 --- a/pkg/analysis_server/lib/src/analysis_server.dart +++ b/pkg/analysis_server/lib/src/analysis_server.dart @@ -65,7 +65,7 @@ import 'package:analyzer/src/generated/utilities_general.dart'; import 'package:analyzer/src/util/glob.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element; import 'package:analyzer_plugin/src/utilities/navigation/navigation.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:telemetry/crash_reporting.dart'; import 'package:telemetry/telemetry.dart' as telemetry; diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart index 850f2ca7d1d..18b897dd369 100644 --- a/pkg/analysis_server/test/abstract_context.dart +++ b/pkg/analysis_server/test/abstract_context.dart @@ -17,7 +17,7 @@ import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/engine.dart' as engine; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source_io.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'mock_sdk.dart'; diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart index f63eaf8a7b3..566c06c5601 100644 --- a/pkg/analysis_server/test/context_manager_test.dart +++ b/pkg/analysis_server/test/context_manager_test.dart @@ -26,7 +26,7 @@ import 'package:analyzer/src/generated/source_io.dart'; import 'package:analyzer/src/services/lint.dart'; import 'package:analyzer/src/summary/summary_file_builder.dart'; import 'package:analyzer/src/util/glob.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:linter/src/rules.dart'; import 'package:linter/src/rules/avoid_as.dart'; diff --git a/pkg/analysis_server/test/services/search/search_engine_test.dart b/pkg/analysis_server/test/services/search/search_engine_test.dart index 7f65d45ce60..6c3bb332c4a 100644 --- a/pkg/analysis_server/test/services/search/search_engine_test.dart +++ b/pkg/analysis_server/test/services/search/search_engine_test.dart @@ -14,7 +14,7 @@ import 'package:analyzer/src/dart/analysis/file_state.dart'; import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart index 4d8291c7bd1..27f99f5ac9a 100644 --- a/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart +++ b/pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart @@ -17,7 +17,7 @@ import 'package:analyzer/src/dart/analysis/file_state.dart'; import 'package:analyzer/src/dart/analysis/session.dart'; import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl; import 'package:analyzer/src/generated/source.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:path/path.dart' as path; import 'package:test/test.dart'; diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart index d7e6f68bf94..4d06fb1db1f 100644 --- a/pkg/analyzer/lib/src/context/builder.dart +++ b/pkg/analyzer/lib/src/context/builder.dart @@ -33,7 +33,7 @@ import 'package:analyzer/src/services/lint.dart'; import 'package:analyzer/src/summary/summary_sdk.dart'; import 'package:analyzer/src/task/options.dart'; import 'package:args/args.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:package_config/packages.dart'; import 'package:package_config/packages_file.dart'; diff --git a/pkg/analyzer/lib/src/dart/analysis/byte_store.dart b/pkg/analyzer/lib/src/dart/analysis/byte_store.dart index 1ad08cc653f..ba051918fca 100644 --- a/pkg/analyzer/lib/src/dart/analysis/byte_store.dart +++ b/pkg/analyzer/lib/src/dart/analysis/byte_store.dart @@ -5,5 +5,5 @@ // This library re-exports the parts of front_end's byte_store.dart whose API is // stable enough to be relied upon by clients. -export 'package:front_end/byte_store.dart' +export 'package:front_end/src/api_prototype/byte_store.dart' show ByteStore, MemoryByteStore, MemoryCachingByteStore; diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart index 6d59142e89f..1bf15ab2bfc 100644 --- a/pkg/analyzer/lib/src/dart/analysis/driver.dart +++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart @@ -40,7 +40,7 @@ import 'package:analyzer/src/lint/registry.dart' as linter; import 'package:analyzer/src/summary/format.dart'; import 'package:analyzer/src/summary/idl.dart'; import 'package:analyzer/src/summary/package_bundle_reader.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/api_signature.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/incremental/kernel_driver.dart' show KernelDriver; diff --git a/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart b/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart index 84090be1ed8..54ddf7ed83e 100644 --- a/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart +++ b/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart @@ -5,4 +5,4 @@ // This library re-exports the parts of front_end's file_byte_store.dart whose // API is stable enough to be relied upon by clients. -export 'package:front_end/byte_store.dart' show FileByteStore; +export 'package:front_end/src/api_prototype/byte_store.dart' show FileByteStore; diff --git a/pkg/analyzer/lib/src/dart/analysis/file_state.dart b/pkg/analyzer/lib/src/dart/analysis/file_state.dart index c714c66b25b..2d1ae3dd65c 100644 --- a/pkg/analyzer/lib/src/dart/analysis/file_state.dart +++ b/pkg/analyzer/lib/src/dart/analysis/file_state.dart @@ -27,7 +27,7 @@ import 'package:analyzer/src/summary/package_bundle_reader.dart'; import 'package:analyzer/src/summary/summarize_ast.dart'; import 'package:convert/convert.dart'; import 'package:crypto/crypto.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/api_signature.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/fasta/scanner/token.dart'; diff --git a/pkg/analyzer/lib/src/dart/analysis/frontend_resolution.dart b/pkg/analyzer/lib/src/dart/analysis/frontend_resolution.dart index 38361495426..0d7c897215f 100644 --- a/pkg/analyzer/lib/src/dart/analysis/frontend_resolution.dart +++ b/pkg/analyzer/lib/src/dart/analysis/frontend_resolution.dart @@ -1,5 +1,5 @@ import 'package:analyzer/src/fasta/resolution_storer.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/fasta/builder/builder.dart'; import 'package:front_end/src/fasta/builder/library_builder.dart'; import 'package:front_end/src/fasta/dill/dill_target.dart'; diff --git a/pkg/analyzer/lib/src/dart/analysis/kernel_context.dart b/pkg/analyzer/lib/src/dart/analysis/kernel_context.dart index 5949de44c9d..47ebc2eb669 100644 --- a/pkg/analyzer/lib/src/dart/analysis/kernel_context.dart +++ b/pkg/analyzer/lib/src/dart/analysis/kernel_context.dart @@ -18,9 +18,9 @@ import 'package:analyzer/src/generated/engine.dart' import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/kernel/resynthesize.dart'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/libraries_specification.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; diff --git a/pkg/analyzer/lib/src/dart/analysis/library_context.dart b/pkg/analyzer/lib/src/dart/analysis/library_context.dart index 149166793d8..fa670bbeac4 100644 --- a/pkg/analyzer/lib/src/dart/analysis/library_context.dart +++ b/pkg/analyzer/lib/src/dart/analysis/library_context.dart @@ -17,7 +17,7 @@ import 'package:analyzer/src/summary/format.dart'; import 'package:analyzer/src/summary/idl.dart'; import 'package:analyzer/src/summary/link.dart'; import 'package:analyzer/src/summary/package_bundle_reader.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; /** diff --git a/pkg/analyzer/lib/src/lint/analysis.dart b/pkg/analyzer/lib/src/lint/analysis.dart index 4f9bbb45a06..dce18a570ae 100644 --- a/pkg/analyzer/lib/src/lint/analysis.dart +++ b/pkg/analyzer/lib/src/lint/analysis.dart @@ -24,7 +24,7 @@ import 'package:analyzer/src/lint/project.dart'; import 'package:analyzer/src/lint/registry.dart'; import 'package:analyzer/src/services/lint.dart'; import 'package:analyzer/src/util/sdk.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:package_config/packages.dart' show Packages; import 'package:package_config/packages_file.dart' as pkgfile show parse; diff --git a/pkg/analyzer/test/generated/resolver_test_case.dart b/pkg/analyzer/test/generated/resolver_test_case.dart index a6b1ab80349..f040574a016 100644 --- a/pkg/analyzer/test/generated/resolver_test_case.dart +++ b/pkg/analyzer/test/generated/resolver_test_case.dart @@ -27,7 +27,7 @@ import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source_io.dart'; import 'package:analyzer/src/generated/testing/ast_test_factory.dart'; import 'package:analyzer/src/generated/testing/element_factory.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/base.dart b/pkg/analyzer/test/src/dart/analysis/base.dart index 8d20476bb41..33f83e8e7a8 100644 --- a/pkg/analyzer/test/src/dart/analysis/base.dart +++ b/pkg/analyzer/test/src/dart/analysis/base.dart @@ -14,7 +14,7 @@ import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/summary/package_bundle_reader.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/driver_test.dart b/pkg/analyzer/test/src/dart/analysis/driver_test.dart index 09c77a2646f..9cc78239d0e 100644 --- a/pkg/analyzer/test/src/dart/analysis/driver_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/driver_test.dart @@ -28,7 +28,7 @@ import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/generated/utilities_dart.dart'; import 'package:analyzer/src/summary/idl.dart'; import 'package:analyzer/src/summary/package_bundle_reader.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer/test/src/dart/analysis/file_state_test.dart b/pkg/analyzer/test/src/dart/analysis/file_state_test.dart index 7d8544fc559..bda64548ccc 100644 --- a/pkg/analyzer/test/src/dart/analysis/file_state_test.dart +++ b/pkg/analyzer/test/src/dart/analysis/file_state_test.dart @@ -15,7 +15,7 @@ import 'package:analyzer/src/generated/engine.dart' import 'package:analyzer/src/generated/source.dart'; import 'package:convert/convert.dart'; import 'package:crypto/crypto.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:mockito/mockito.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart b/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart index 533777aa9cb..840e620e1b4 100644 --- a/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart +++ b/pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart @@ -14,9 +14,9 @@ import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/kernel/resynthesize.dart'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/libraries_specification.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; diff --git a/pkg/analyzer/test/src/task/strong/strong_test_helper.dart b/pkg/analyzer/test/src/task/strong/strong_test_helper.dart index 0d861df7edb..b27ef2e0874 100644 --- a/pkg/analyzer/test/src/task/strong/strong_test_helper.dart +++ b/pkg/analyzer/test/src/task/strong/strong_test_helper.dart @@ -23,7 +23,7 @@ import 'package:analyzer/src/dart/ast/token.dart'; import 'package:analyzer/src/error/codes.dart'; import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/source.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:source_span/source_span.dart'; import 'package:test/test.dart'; diff --git a/pkg/analyzer/tool/task_dependency_graph/generate.dart b/pkg/analyzer/tool/task_dependency_graph/generate.dart index 27a9b08a4ee..dbb7b1dad8c 100644 --- a/pkg/analyzer/tool/task_dependency_graph/generate.dart +++ b/pkg/analyzer/tool/task_dependency_graph/generate.dart @@ -37,7 +37,7 @@ import 'package:analyzer/src/generated/resolver.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source.dart'; import 'package:analyzer/src/generated/source_io.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/codegen/tools.dart'; import 'package:front_end/src/testing/package_root.dart' as package_root; diff --git a/pkg/analyzer_cli/lib/src/build_mode.dart b/pkg/analyzer_cli/lib/src/build_mode.dart index 9dd40fc86e0..b5bfbcd1b26 100644 --- a/pkg/analyzer_cli/lib/src/build_mode.dart +++ b/pkg/analyzer_cli/lib/src/build_mode.dart @@ -31,7 +31,7 @@ import 'package:analyzer_cli/src/options.dart'; import 'package:bazel_worker/bazel_worker.dart'; import 'package:collection/collection.dart'; import 'package:convert/convert.dart'; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/byte_store/cache.dart'; diff --git a/pkg/analyzer_cli/lib/src/driver.dart b/pkg/analyzer_cli/lib/src/driver.dart index cace64a389e..0f54ab7dabb 100644 --- a/pkg/analyzer_cli/lib/src/driver.dart +++ b/pkg/analyzer_cli/lib/src/driver.dart @@ -39,7 +39,7 @@ import 'package:analyzer_cli/src/error_severity.dart'; import 'package:analyzer_cli/src/options.dart'; import 'package:analyzer_cli/src/perf_report.dart'; import 'package:analyzer_cli/starter.dart' show CommandLineStarter; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:linter/src/rules.dart' as linter; import 'package:meta/meta.dart'; diff --git a/pkg/compiler/lib/src/kernel/front_end_adapter.dart b/pkg/compiler/lib/src/kernel/front_end_adapter.dart index 5a631fd66ce..bb70bb50f9b 100644 --- a/pkg/compiler/lib/src/kernel/front_end_adapter.dart +++ b/pkg/compiler/lib/src/kernel/front_end_adapter.dart @@ -8,7 +8,7 @@ library compiler.kernel.front_end_adapter; import 'dart:async'; -import 'package:front_end/front_end.dart' as fe; +import 'package:front_end/src/api_prototype/front_end.dart' as fe; import '../../compiler_new.dart' as api; diff --git a/pkg/compiler/lib/src/library_loader.dart b/pkg/compiler/lib/src/library_loader.dart index 04c35384b51..59a50e4e848 100644 --- a/pkg/compiler/lib/src/library_loader.dart +++ b/pkg/compiler/lib/src/library_loader.dart @@ -6,7 +6,7 @@ library dart2js.library_loader; import 'dart:async'; -import 'package:front_end/front_end.dart' as fe; +import 'package:front_end/src/api_prototype/front_end.dart' as fe; import 'package:kernel/ast.dart' as ir; import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder; import 'package:kernel/kernel.dart' hide LibraryDependency, Combinator; diff --git a/pkg/compiler/tool/generate_kernel.dart b/pkg/compiler/tool/generate_kernel.dart index e9daff20043..b8d1434d033 100644 --- a/pkg/compiler/tool/generate_kernel.dart +++ b/pkg/compiler/tool/generate_kernel.dart @@ -13,7 +13,7 @@ import 'dart:io'; import 'package:args/args.dart'; import 'package:compiler/src/kernel/dart2js_target.dart'; import 'package:compiler/src/filenames.dart'; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart' show computePlatformBinariesLocation; import 'package:front_end/src/fasta/util/relativize.dart'; diff --git a/pkg/dev_compiler/lib/src/kernel/command.dart b/pkg/dev_compiler/lib/src/kernel/command.dart index 630e11e473a..43b5ff10580 100644 --- a/pkg/dev_compiler/lib/src/kernel/command.dart +++ b/pkg/dev_compiler/lib/src/kernel/command.dart @@ -7,8 +7,8 @@ import 'dart:convert' show JSON; import 'dart:io'; import 'package:args/args.dart'; import 'package:dev_compiler/src/kernel/target.dart'; -import 'package:front_end/compilation_message.dart'; -import 'package:front_end/compiler_options.dart'; +import 'package:front_end/src/api_prototype/compilation_message.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/kernel_generator_impl.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:kernel/kernel.dart'; diff --git a/pkg/dev_compiler/tool/build_pkgs.dart b/pkg/dev_compiler/tool/build_pkgs.dart index f9495b0d153..b67fbb2786f 100755 --- a/pkg/dev_compiler/tool/build_pkgs.dart +++ b/pkg/dev_compiler/tool/build_pkgs.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'dart:io'; import 'package:args/args.dart'; -import 'package:front_end/compilation_message.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/summary_generator.dart'; +import 'package:front_end/src/api_prototype/compilation_message.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/summary_generator.dart'; import 'package:path/path.dart' as p; import 'package:dev_compiler/src/analyzer/command.dart' as analyzer; diff --git a/pkg/dev_compiler/tool/kernel_sdk.dart b/pkg/dev_compiler/tool/kernel_sdk.dart index 6a7452a8887..ac35ee2e9f7 100755 --- a/pkg/dev_compiler/tool/kernel_sdk.dart +++ b/pkg/dev_compiler/tool/kernel_sdk.dart @@ -8,8 +8,8 @@ import 'dart:async'; import 'package:dev_compiler/src/compiler/module_builder.dart'; import 'package:dev_compiler/src/kernel/target.dart'; import 'package:dev_compiler/src/kernel/command.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/kernel_generator.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/kernel_generator.dart'; import 'package:kernel/kernel.dart'; import 'package:path/path.dart' as path; import 'patch_sdk.dart' as patch_sdk; diff --git a/pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart b/pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart index 688fb24def6..f164c52001c 100644 --- a/pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart +++ b/pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart @@ -10,9 +10,9 @@ library front_end.example.incremental_reload.compiler_with_invalidation; import 'dart:io'; import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/binary/limited_ast_to_binary.dart'; import 'package:kernel/target/targets.dart'; diff --git a/pkg/front_end/lib/byte_store.dart b/pkg/front_end/lib/src/api_prototype/byte_store.dart similarity index 100% rename from pkg/front_end/lib/byte_store.dart rename to pkg/front_end/lib/src/api_prototype/byte_store.dart diff --git a/pkg/front_end/lib/compilation_message.dart b/pkg/front_end/lib/src/api_prototype/compilation_message.dart similarity index 100% rename from pkg/front_end/lib/compilation_message.dart rename to pkg/front_end/lib/src/api_prototype/compilation_message.dart diff --git a/pkg/front_end/lib/compiler_options.dart b/pkg/front_end/lib/src/api_prototype/compiler_options.dart similarity index 99% rename from pkg/front_end/lib/compiler_options.dart rename to pkg/front_end/lib/src/api_prototype/compiler_options.dart index 205aaa22831..4927af07194 100644 --- a/pkg/front_end/lib/compiler_options.dart +++ b/pkg/front_end/lib/src/api_prototype/compiler_options.dart @@ -4,7 +4,7 @@ library front_end.compiler_options; -import 'package:front_end/byte_store.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:kernel/target/targets.dart' show Target; diff --git a/pkg/front_end/lib/dependency_grapher.dart b/pkg/front_end/lib/src/api_prototype/dependency_grapher.dart similarity index 96% rename from pkg/front_end/lib/dependency_grapher.dart rename to pkg/front_end/lib/src/api_prototype/dependency_grapher.dart index 61204902d7d..fed5df94978 100644 --- a/pkg/front_end/lib/dependency_grapher.dart +++ b/pkg/front_end/lib/src/api_prototype/dependency_grapher.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:front_end/compiler_options.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/dependency_grapher_impl.dart' as impl; diff --git a/pkg/front_end/lib/file_system.dart b/pkg/front_end/lib/src/api_prototype/file_system.dart similarity index 100% rename from pkg/front_end/lib/file_system.dart rename to pkg/front_end/lib/src/api_prototype/file_system.dart diff --git a/pkg/front_end/lib/front_end.dart b/pkg/front_end/lib/src/api_prototype/front_end.dart similarity index 100% rename from pkg/front_end/lib/front_end.dart rename to pkg/front_end/lib/src/api_prototype/front_end.dart diff --git a/pkg/front_end/lib/incremental_kernel_generator.dart b/pkg/front_end/lib/src/api_prototype/incremental_kernel_generator.dart similarity index 100% rename from pkg/front_end/lib/incremental_kernel_generator.dart rename to pkg/front_end/lib/src/api_prototype/incremental_kernel_generator.dart diff --git a/pkg/front_end/lib/kernel_generator.dart b/pkg/front_end/lib/src/api_prototype/kernel_generator.dart similarity index 94% rename from pkg/front_end/lib/kernel_generator.dart rename to pkg/front_end/lib/src/api_prototype/kernel_generator.dart index aae71f0544e..e37423ab636 100644 --- a/pkg/front_end/lib/kernel_generator.dart +++ b/pkg/front_end/lib/src/api_prototype/kernel_generator.dart @@ -11,11 +11,11 @@ import 'dart:async'; import 'package:kernel/kernel.dart' show Program; import 'compiler_options.dart'; -import 'src/base/processed_options.dart'; -import 'src/fasta/fasta_codes.dart'; -import 'src/fasta/compiler_context.dart'; -import 'src/fasta/severity.dart'; -import 'src/kernel_generator_impl.dart'; +import '../base/processed_options.dart'; +import '../fasta/fasta_codes.dart'; +import '../fasta/compiler_context.dart'; +import '../fasta/severity.dart'; +import '../kernel_generator_impl.dart'; /// Generates a kernel representation of the program whose main library is in /// the given [source]. diff --git a/pkg/front_end/lib/memory_file_system.dart b/pkg/front_end/lib/src/api_prototype/memory_file_system.dart similarity index 100% rename from pkg/front_end/lib/memory_file_system.dart rename to pkg/front_end/lib/src/api_prototype/memory_file_system.dart diff --git a/pkg/front_end/lib/physical_file_system.dart b/pkg/front_end/lib/src/api_prototype/physical_file_system.dart similarity index 100% rename from pkg/front_end/lib/physical_file_system.dart rename to pkg/front_end/lib/src/api_prototype/physical_file_system.dart diff --git a/pkg/front_end/lib/summary_generator.dart b/pkg/front_end/lib/src/api_prototype/summary_generator.dart similarity index 95% rename from pkg/front_end/lib/summary_generator.dart rename to pkg/front_end/lib/src/api_prototype/summary_generator.dart index 539cc2b2722..65571561b43 100644 --- a/pkg/front_end/lib/summary_generator.dart +++ b/pkg/front_end/lib/src/api_prototype/summary_generator.dart @@ -8,8 +8,8 @@ library front_end.summary_generator; import 'dart:async'; import 'compiler_options.dart'; -import 'src/base/processed_options.dart'; -import 'src/kernel_generator_impl.dart'; +import '../base/processed_options.dart'; +import '../kernel_generator_impl.dart'; /// Creates a summary representation of the build unit whose source files are in /// [sources]. diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index 2fb80548665..1e8a34576a4 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -4,10 +4,10 @@ import 'dart:async'; -import 'package:front_end/compilation_message.dart'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/compilation_message.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/fasta/fasta_codes.dart'; import 'package:front_end/src/fasta/problems.dart' show unimplemented; diff --git a/pkg/front_end/lib/src/dependency_grapher_impl.dart b/pkg/front_end/lib/src/dependency_grapher_impl.dart index d763be27142..f22f9923e75 100644 --- a/pkg/front_end/lib/src/dependency_grapher_impl.dart +++ b/pkg/front_end/lib/src/dependency_grapher_impl.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:front_end/dependency_grapher.dart'; +import 'package:front_end/src/api_prototype/dependency_grapher.dart'; import 'package:front_end/src/async_dependency_walker.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/parser.dart'; @@ -22,7 +22,7 @@ import 'package:front_end/src/fasta/uri_translator.dart'; /// they are read directly from `options.fileSystem`. /// /// This is intended for internal use by the front end. Clients should use -/// package:front_end/dependency_grapher.dart. +/// package:front_end/src/api_prototype/dependency_grapher.dart. Future graphForProgram(List sources, ProcessedOptions options, {FileReader fileReader}) async { UriTranslator uriTranslator = await options.getUriTranslator(); diff --git a/pkg/front_end/lib/src/fasta/compiler_context.dart b/pkg/front_end/lib/src/fasta/compiler_context.dart index 04f3303bf7d..6533eeb29fd 100644 --- a/pkg/front_end/lib/src/fasta/compiler_context.dart +++ b/pkg/front_end/lib/src/fasta/compiler_context.dart @@ -6,8 +6,8 @@ library fasta.compiler_context; import 'dart:async' show Zone, runZoned; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/fasta_codes.dart'; import 'package:kernel/ast.dart' show Source; diff --git a/pkg/front_end/lib/src/fasta/get_dependencies.dart b/pkg/front_end/lib/src/fasta/get_dependencies.dart index e2c4bb13644..b9d7999833f 100644 --- a/pkg/front_end/lib/src/fasta/get_dependencies.dart +++ b/pkg/front_end/lib/src/fasta/get_dependencies.dart @@ -10,9 +10,9 @@ import 'package:kernel/kernel.dart' show loadProgramFromBytes; import 'package:kernel/target/targets.dart' show Target; -import '../../compiler_options.dart' show CompilerOptions; +import '../api_prototype/compiler_options.dart' show CompilerOptions; -import '../../file_system.dart' show FileSystem; +import '../api_prototype/file_system.dart' show FileSystem; import '../base/processed_options.dart' show ProcessedOptions; diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart index aa13c831e23..eedb4a477f3 100644 --- a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart @@ -42,7 +42,7 @@ import 'package:kernel/ast.dart' import 'package:kernel/type_algebra.dart' show substitute; -import '../../../file_system.dart' show FileSystem; +import '../../api_prototype/file_system.dart' show FileSystem; import '../compiler_context.dart' show CompilerContext; diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart index 16927081ebb..bc253951593 100644 --- a/pkg/front_end/lib/src/fasta/source/source_loader.dart +++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart @@ -20,7 +20,7 @@ import 'package:kernel/core_types.dart' show CoreTypes; import 'package:kernel/src/incremental_class_hierarchy.dart' show IncrementalClassHierarchy; -import '../../../file_system.dart'; +import '../../api_prototype/file_system.dart'; import '../../base/instrumentation.dart' show Instrumentation; diff --git a/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart b/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart index 4ad02ad4a93..4e4c1560258 100644 --- a/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart +++ b/pkg/front_end/lib/src/fasta/testing/kernel_chain.dart @@ -32,7 +32,7 @@ import 'package:kernel/text/ast_to_text.dart' show Printer; import 'package:testing/testing.dart' show ChainContext, Result, StdioProcess, Step, TestDescription; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; diff --git a/pkg/front_end/lib/src/fasta/uri_translator.dart b/pkg/front_end/lib/src/fasta/uri_translator.dart index e2274069435..d2f32ff0dd8 100644 --- a/pkg/front_end/lib/src/fasta/uri_translator.dart +++ b/pkg/front_end/lib/src/fasta/uri_translator.dart @@ -4,7 +4,7 @@ library fasta.uri_translator; -import 'package:front_end/file_system.dart' show FileSystem; +import 'package:front_end/src/api_prototype/file_system.dart' show FileSystem; /// Instances of [UriTranslator] translate absolute URIs into corresponding /// file URIs in a [FileSystem]. Translated URIs are typically `file:` URIs, diff --git a/pkg/front_end/lib/src/incremental/file_state.dart b/pkg/front_end/lib/src/incremental/file_state.dart index a2af6420310..88a24b0cc8a 100644 --- a/pkg/front_end/lib/src/incremental/file_state.dart +++ b/pkg/front_end/lib/src/incremental/file_state.dart @@ -8,8 +8,8 @@ import 'dart:typed_data'; import 'package:convert/convert.dart'; import 'package:crypto/crypto.dart'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/api_signature.dart'; import 'package:front_end/src/base/resolve_relative_uri.dart'; import 'package:front_end/src/dependency_walker.dart' as graph; diff --git a/pkg/front_end/lib/src/incremental/kernel_driver.dart b/pkg/front_end/lib/src/incremental/kernel_driver.dart index a590d9d609a..909089d7ea8 100644 --- a/pkg/front_end/lib/src/incremental/kernel_driver.dart +++ b/pkg/front_end/lib/src/incremental/kernel_driver.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; import 'package:front_end/src/base/api_signature.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; diff --git a/pkg/front_end/lib/src/incremental_kernel_generator_impl.dart b/pkg/front_end/lib/src/incremental_kernel_generator_impl.dart index 89931e29d90..91abecaaf6d 100644 --- a/pkg/front_end/lib/src/incremental_kernel_generator_impl.dart +++ b/pkg/front_end/lib/src/incremental_kernel_generator_impl.dart @@ -5,9 +5,9 @@ import 'dart:async'; import 'dart:convert'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/file_system.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; import 'package:front_end/src/base/api_signature.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; diff --git a/pkg/front_end/lib/src/kernel_generator_impl.dart b/pkg/front_end/lib/src/kernel_generator_impl.dart index a772ccd0906..6f917dbe06f 100644 --- a/pkg/front_end/lib/src/kernel_generator_impl.dart +++ b/pkg/front_end/lib/src/kernel_generator_impl.dart @@ -21,8 +21,9 @@ import 'fasta/kernel/utils.dart'; import 'fasta/kernel/verifier.dart'; import 'fasta/uri_translator.dart' show UriTranslator; -/// Implementation for the `package:front_end/kernel_generator.dart` and -/// `package:front_end/summary_generator.dart` APIs. +/// Implementation for the +/// `package:front_end/src/api_prototype/kernel_generator.dart` and +/// `package:front_end/src/api_prototype/summary_generator.dart` APIs. Future generateKernel(ProcessedOptions options, {bool buildSummary: false, bool buildProgram: true, diff --git a/pkg/front_end/lib/src/minimal_incremental_kernel_generator.dart b/pkg/front_end/lib/src/minimal_incremental_kernel_generator.dart index 0e30c3c230d..f586c9f76ff 100644 --- a/pkg/front_end/lib/src/minimal_incremental_kernel_generator.dart +++ b/pkg/front_end/lib/src/minimal_incremental_kernel_generator.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:front_end/file_system.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/compiler_context.dart'; diff --git a/pkg/front_end/lib/src/multi_root_file_system.dart b/pkg/front_end/lib/src/multi_root_file_system.dart index 9cf5e90f7d4..a30e75fd764 100644 --- a/pkg/front_end/lib/src/multi_root_file_system.dart +++ b/pkg/front_end/lib/src/multi_root_file_system.dart @@ -7,7 +7,7 @@ library front_end.src.multi_roots_file_system; import 'dart:async'; -import 'package:front_end/file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; /// Wraps a file system to create an overlay of files from multiple roots. /// diff --git a/pkg/front_end/lib/src/testing/compiler_common.dart b/pkg/front_end/lib/src/testing/compiler_common.dart index 9fe8093522f..67eae730ca9 100644 --- a/pkg/front_end/lib/src/testing/compiler_common.dart +++ b/pkg/front_end/lib/src/testing/compiler_common.dart @@ -9,8 +9,8 @@ import 'dart:async'; import 'dart:io' show Platform; -import 'package:front_end/front_end.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/testing/hybrid_file_system.dart'; import 'package:kernel/ast.dart'; diff --git a/pkg/front_end/lib/src/testing/hybrid_file_system.dart b/pkg/front_end/lib/src/testing/hybrid_file_system.dart index 0a8bd7591d2..18a75584e35 100644 --- a/pkg/front_end/lib/src/testing/hybrid_file_system.dart +++ b/pkg/front_end/lib/src/testing/hybrid_file_system.dart @@ -8,9 +8,9 @@ library front_end.src.hybrid_file_system; import 'dart:async'; -import 'package:front_end/file_system.dart'; -import 'package:front_end/memory_file_system.dart'; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; /// A file system that mixes files from memory and a physical file system. All /// memory entities take priotity over file system entities. diff --git a/pkg/front_end/test/dependency_grapher_test.dart b/pkg/front_end/test/dependency_grapher_test.dart index 39b83869444..4d7e981dd04 100644 --- a/pkg/front_end/test/dependency_grapher_test.dart +++ b/pkg/front_end/test/dependency_grapher_test.dart @@ -4,9 +4,9 @@ import 'dart:async'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/dependency_grapher.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/dependency_grapher.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/front_end/test/fasta/reexport_test.dart b/pkg/front_end/test/fasta/reexport_test.dart index 48ca59823dd..98a1ae73753 100644 --- a/pkg/front_end/test/fasta/reexport_test.dart +++ b/pkg/front_end/test/fasta/reexport_test.dart @@ -6,7 +6,8 @@ import "package:async_helper/async_helper.dart" show asyncTest; import "package:front_end/src/testing/compiler_common.dart" show compileUnit; -import "package:front_end/front_end.dart" show CompilerOptions; +import "package:front_end/src/api_prototype/front_end.dart" + show CompilerOptions; main() { asyncTest(() async { diff --git a/pkg/front_end/test/fasta/shaker_test.dart b/pkg/front_end/test/fasta/shaker_test.dart index d34a4147601..757e778ce26 100644 --- a/pkg/front_end/test/fasta/shaker_test.dart +++ b/pkg/front_end/test/fasta/shaker_test.dart @@ -20,7 +20,7 @@ import 'dart:convert' show JSON; import 'dart:io' show File; export 'package:testing/testing.dart' show Chain, runMe; -import 'package:front_end/compiler_options.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; import 'package:front_end/src/fasta/compiler_context.dart'; diff --git a/pkg/front_end/test/fasta/testing/analyzer_loader.dart b/pkg/front_end/test/fasta/testing/analyzer_loader.dart index 1478047fe69..2d229b3394b 100644 --- a/pkg/front_end/test/fasta/testing/analyzer_loader.dart +++ b/pkg/front_end/test/fasta/testing/analyzer_loader.dart @@ -4,7 +4,7 @@ library fasta.analyzer_loader; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; import 'package:kernel/ast.dart' show Program; import 'package:front_end/src/fasta/builder/builder.dart' show LibraryBuilder; diff --git a/pkg/front_end/test/fasta/testing/analyzer_target.dart b/pkg/front_end/test/fasta/testing/analyzer_target.dart index ae7d292e15c..d6e7f89094d 100644 --- a/pkg/front_end/test/fasta/testing/analyzer_target.dart +++ b/pkg/front_end/test/fasta/testing/analyzer_target.dart @@ -4,7 +4,7 @@ library fasta.analyzer_target; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; import 'package:kernel/ast.dart' show Library, Source; import 'package:front_end/src/fasta/kernel/kernel_target.dart' diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/fasta/testing/suite.dart index 91abee900bb..dc9da3d8bfb 100644 --- a/pkg/front_end/test/fasta/testing/suite.dart +++ b/pkg/front_end/test/fasta/testing/suite.dart @@ -10,7 +10,8 @@ import 'dart:io' show File, Platform; import 'dart:convert' show JSON; -import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem; +import 'package:front_end/src/api_prototype/physical_file_system.dart' + show PhysicalFileSystem; import 'package:front_end/src/base/libraries_specification.dart' show TargetLibrariesSpecification; @@ -33,7 +34,8 @@ import 'package:testing/testing.dart' TestDescription, StdioProcess; -import 'package:front_end/compiler_options.dart' show CompilerOptions; +import 'package:front_end/src/api_prototype/compiler_options.dart' + show CompilerOptions; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; diff --git a/pkg/front_end/test/incremental_kernel_generator_test.dart b/pkg/front_end/test/incremental_kernel_generator_test.dart index e79e540a7a5..e99f3af9c46 100644 --- a/pkg/front_end/test/incremental_kernel_generator_test.dart +++ b/pkg/front_end/test/incremental_kernel_generator_test.dart @@ -4,13 +4,13 @@ import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/fasta/kernel/utils.dart'; import 'package:front_end/src/incremental_kernel_generator_impl.dart'; -import 'package:front_end/summary_generator.dart'; +import 'package:front_end/src/api_prototype/summary_generator.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/text/ast_to_text.dart'; import 'package:test/test.dart'; diff --git a/pkg/front_end/test/kernel_generator_test.dart b/pkg/front_end/test/kernel_generator_test.dart index b48427820bd..a0a1eae81f6 100644 --- a/pkg/front_end/test/kernel_generator_test.dart +++ b/pkg/front_end/test/kernel_generator_test.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 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/fasta/fasta_codes.dart'; import 'package:front_end/src/fasta/kernel/utils.dart'; import 'package:front_end/src/fasta/deprecated_problems.dart' diff --git a/pkg/front_end/test/memory_file_system_test.dart b/pkg/front_end/test/memory_file_system_test.dart index 51747eff1b3..f679d0b0f92 100644 --- a/pkg/front_end/test/memory_file_system_test.dart +++ b/pkg/front_end/test/memory_file_system_test.dart @@ -8,8 +8,9 @@ library front_end.test.memory_file_system_test; import 'dart:convert'; import 'dart:io' as io; -import 'package:front_end/file_system.dart' show FileSystemException; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart' + show FileSystemException; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:path/path.dart' as pathos; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/front_end/test/minimal_incremental_kernel_generator_test.dart b/pkg/front_end/test/minimal_incremental_kernel_generator_test.dart index e4d8781fdf4..d6333559223 100644 --- a/pkg/front_end/test/minimal_incremental_kernel_generator_test.dart +++ b/pkg/front_end/test/minimal_incremental_kernel_generator_test.dart @@ -4,14 +4,14 @@ import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/fasta/kernel/utils.dart'; import 'package:front_end/src/incremental_kernel_generator_impl.dart'; import 'package:front_end/src/minimal_incremental_kernel_generator.dart'; -import 'package:front_end/summary_generator.dart'; +import 'package:front_end/src/api_prototype/summary_generator.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/text/ast_to_text.dart'; import 'package:test/test.dart'; diff --git a/pkg/front_end/test/mixin_export_test.dart b/pkg/front_end/test/mixin_export_test.dart index c185b6813b0..04107f50fee 100644 --- a/pkg/front_end/test/mixin_export_test.dart +++ b/pkg/front_end/test/mixin_export_test.dart @@ -5,7 +5,7 @@ import 'package:async_helper/async_helper.dart' show asyncTest; import 'package:front_end/src/testing/compiler_common.dart'; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; main() { asyncTest(() async { diff --git a/pkg/front_end/test/physical_file_system_test.dart b/pkg/front_end/test/physical_file_system_test.dart index 82a6e62bae4..0b4438dbb53 100644 --- a/pkg/front_end/test/physical_file_system_test.dart +++ b/pkg/front_end/test/physical_file_system_test.dart @@ -9,8 +9,8 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io' as io; -import 'package:front_end/file_system.dart'; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; import 'package:path/path.dart' as p; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/front_end/test/src/base/processed_options_test.dart b/pkg/front_end/test/src/base/processed_options_test.dart index 2c72eaf7a4b..1eb44b5bedd 100644 --- a/pkg/front_end/test/src/base/processed_options_test.dart +++ b/pkg/front_end/test/src/base/processed_options_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/compiler_context.dart'; import 'package:front_end/src/fasta/util/bytes_sink.dart' show BytesSink; diff --git a/pkg/front_end/test/src/incremental/file_state_test.dart b/pkg/front_end/test/src/incremental/file_state_test.dart index 36ab8ec3025..e9d868242e9 100644 --- a/pkg/front_end/test/src/incremental/file_state_test.dart +++ b/pkg/front_end/test/src/incremental/file_state_test.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/fasta/uri_translator_impl.dart'; import 'package:front_end/src/incremental/file_state.dart'; import 'package:kernel/target/targets.dart'; diff --git a/pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart b/pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart index 99513988e88..a9cbc0b9d5e 100644 --- a/pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart +++ b/pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart @@ -11,11 +11,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/file_system.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/testing/hybrid_file_system.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/binary/limited_ast_to_binary.dart'; diff --git a/pkg/front_end/test/src/incremental/kernel_driver_test.dart b/pkg/front_end/test/src/incremental/kernel_driver_test.dart index 9cb5d8e3ea6..23ad228b8e8 100644 --- a/pkg/front_end/test/src/incremental/kernel_driver_test.dart +++ b/pkg/front_end/test/src/incremental/kernel_driver_test.dart @@ -4,15 +4,15 @@ import 'dart:async'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/base/performance_logger.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/kernel/utils.dart'; import 'package:front_end/src/fasta/uri_translator_impl.dart'; import 'package:front_end/src/incremental/kernel_driver.dart'; -import 'package:front_end/summary_generator.dart'; +import 'package:front_end/src/api_prototype/summary_generator.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/binary/ast_from_binary.dart'; import 'package:kernel/target/targets.dart'; diff --git a/pkg/front_end/test/src/incremental/mock_sdk.dart b/pkg/front_end/test/src/incremental/mock_sdk.dart index f0f088c4c03..64720c46fb1 100644 --- a/pkg/front_end/test/src/incremental/mock_sdk.dart +++ b/pkg/front_end/test/src/incremental/mock_sdk.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 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/base/libraries_specification.dart'; final _ASYNC = r''' diff --git a/pkg/front_end/test/src/multi_root_file_system_test.dart b/pkg/front_end/test/src/multi_root_file_system_test.dart index a1abf132c1a..9a29993974b 100644 --- a/pkg/front_end/test/src/multi_root_file_system_test.dart +++ b/pkg/front_end/test/src/multi_root_file_system_test.dart @@ -6,7 +6,7 @@ library front_end.test.src.multi_root_file_system.dart; import 'dart:async'; -import 'package:front_end/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/multi_root_file_system.dart'; import 'package:test/test.dart'; diff --git a/pkg/front_end/test/subpackage_relationships_test.dart b/pkg/front_end/test/subpackage_relationships_test.dart index 4214be1add0..bd6462d8843 100644 --- a/pkg/front_end/test/subpackage_relationships_test.dart +++ b/pkg/front_end/test/subpackage_relationships_test.dart @@ -5,8 +5,8 @@ import 'dart:async'; import 'dart:io'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/dependency_grapher.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/dependency_grapher.dart'; import 'package:front_end/src/testing/package_root.dart' as package_root; import 'package:path/path.dart' as pathos; @@ -39,14 +39,8 @@ final allowedPackageDependencies = [ /// TODO(paulberry): stuff in lib/src shouldn't depend on lib; lib should just /// re-export stuff in lib/src. final subpackageRules = { - 'lib': new SubpackageRules(allowedDependencies: [ - 'lib/src', - 'lib/src/base', - 'lib/src/byte_store', - 'lib/src/fasta', - ]), 'lib/src': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src/base', 'lib/src/fasta', "lib/src/fasta/dill", @@ -54,9 +48,15 @@ final subpackageRules = { 'lib/src/fasta/source', 'lib/src/incremental', ]), - 'lib/src/base': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype': new SubpackageRules(allowedDependencies: [ 'lib/src', + 'lib/src/base', + 'lib/src/byte_store', + 'lib/src/fasta', + ]), + 'lib/src/base': new SubpackageRules(allowedDependencies: [ + 'lib/src', + 'lib/src/api_prototype', 'lib/src/fasta', 'lib/src/fasta/util', ]), @@ -65,7 +65,7 @@ final subpackageRules = { 'lib/src/byte_store': new SubpackageRules(allowedDependencies: []), 'lib/src/codegen': new SubpackageRules(), 'lib/src/fasta': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src/base', 'lib/src/fasta/builder', 'lib/src/fasta/dill', @@ -87,7 +87,7 @@ final subpackageRules = { 'lib/src/fasta/kernel', ]), 'lib/src/fasta/kernel': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src/fasta', 'lib/src/base', 'lib/src/fasta/builder', @@ -112,7 +112,7 @@ final subpackageRules = { 'lib/src/fasta/util', ]), 'lib/src/fasta/source': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src/fasta', 'lib/src/base', 'lib/src/fasta/builder', @@ -123,7 +123,7 @@ final subpackageRules = { 'lib/src/scanner', ]), 'lib/src/fasta/testing': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src', 'lib/src/base', 'lib/src/fasta', @@ -139,7 +139,7 @@ final subpackageRules = { ]), 'lib/src/fasta/util': new SubpackageRules(), 'lib/src/incremental': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', 'lib/src', 'lib/src/base', 'lib/src/fasta', @@ -157,7 +157,7 @@ final subpackageRules = { 'lib/src/fasta/scanner', ]), 'lib/src/testing': new SubpackageRules(allowedDependencies: [ - 'lib', + 'lib/src/api_prototype', ]), }; diff --git a/pkg/front_end/test/summary_generator_test.dart b/pkg/front_end/test/summary_generator_test.dart index 5f6c6f2f633..bfd3b4f4956 100644 --- a/pkg/front_end/test/summary_generator_test.dart +++ b/pkg/front_end/test/summary_generator_test.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 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/testing/compiler_common.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/kernel.dart'; diff --git a/pkg/front_end/tool/_fasta/bulk_compile.dart b/pkg/front_end/tool/_fasta/bulk_compile.dart index 646d1c28a25..30940de6495 100644 --- a/pkg/front_end/tool/_fasta/bulk_compile.dart +++ b/pkg/front_end/tool/_fasta/bulk_compile.dart @@ -6,12 +6,14 @@ import 'dart:async' show Future; import 'dart:convert' show UTF8; -import 'package:front_end/compiler_options.dart' show CompilerOptions; +import 'package:front_end/src/api_prototype/compiler_options.dart' + show CompilerOptions; -import 'package:front_end/file_system.dart' +import 'package:front_end/src/api_prototype/file_system.dart' show FileSystem, FileSystemEntity, FileSystemException; -import 'package:front_end/physical_file_system.dart' show PhysicalFileSystem; +import 'package:front_end/src/api_prototype/physical_file_system.dart' + show PhysicalFileSystem; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; diff --git a/pkg/front_end/tool/_fasta/bulk_compile_test.dart b/pkg/front_end/tool/_fasta/bulk_compile_test.dart index cbd81b2d189..2c3d3664e9a 100644 --- a/pkg/front_end/tool/_fasta/bulk_compile_test.dart +++ b/pkg/front_end/tool/_fasta/bulk_compile_test.dart @@ -4,7 +4,8 @@ import 'dart:isolate' show ReceivePort; -import 'package:front_end/compiler_options.dart' show CompilerOptions; +import 'package:front_end/src/api_prototype/compiler_options.dart' + show CompilerOptions; import 'bulk_compile.dart' show BulkCompiler; diff --git a/pkg/front_end/tool/_fasta/command_line.dart b/pkg/front_end/tool/_fasta/command_line.dart index 1ee5d74a547..e1101f08109 100644 --- a/pkg/front_end/tool/_fasta/command_line.dart +++ b/pkg/front_end/tool/_fasta/command_line.dart @@ -6,7 +6,8 @@ library fasta.tool.command_line; import 'dart:io' show exit; -import 'package:front_end/compiler_options.dart' show CompilerOptions; +import 'package:front_end/src/api_prototype/compiler_options.dart' + show CompilerOptions; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; diff --git a/pkg/front_end/tool/bazel/worker.dart b/pkg/front_end/tool/bazel/worker.dart index 3ee8f52833e..d49ca871cd1 100644 --- a/pkg/front_end/tool/bazel/worker.dart +++ b/pkg/front_end/tool/bazel/worker.dart @@ -6,7 +6,8 @@ import 'dart:io'; import 'package:args/args.dart'; import 'package:bazel_worker/bazel_worker.dart'; -import 'package:front_end/front_end.dart' hide FileSystemException; +import 'package:front_end/src/api_prototype/front_end.dart' + hide FileSystemException; import 'package:front_end/src/fasta/command_line_reporting.dart'; import 'package:kernel/target/targets.dart'; diff --git a/pkg/front_end/tool/example.dart b/pkg/front_end/tool/example.dart index 5483558a46f..a826fe80c21 100644 --- a/pkg/front_end/tool/example.dart +++ b/pkg/front_end/tool/example.dart @@ -4,8 +4,8 @@ import 'dart:async'; -import 'package:front_end/kernel_generator.dart'; -import 'package:front_end/compiler_options.dart'; +import 'package:front_end/src/api_prototype/kernel_generator.dart'; +import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:kernel/binary/ast_to_binary.dart'; import 'package:kernel/kernel.dart' show Program; diff --git a/pkg/front_end/tool/fasta_perf.dart b/pkg/front_end/tool/fasta_perf.dart index 141c203ee14..e5f8125e435 100644 --- a/pkg/front_end/tool/fasta_perf.dart +++ b/pkg/front_end/tool/fasta_perf.dart @@ -11,7 +11,7 @@ import 'dart:io'; import 'package:analyzer/src/fasta/ast_builder.dart'; import 'package:args/args.dart'; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/parser.dart'; import 'package:front_end/src/fasta/scanner.dart'; diff --git a/pkg/front_end/tool/fasta_perf_test.dart b/pkg/front_end/tool/fasta_perf_test.dart index 96123f8d2cf..6c174c027f5 100644 --- a/pkg/front_end/tool/fasta_perf_test.dart +++ b/pkg/front_end/tool/fasta_perf_test.dart @@ -14,7 +14,8 @@ main() async { 'scan', 'kernel_gen_e2e', ]; - var inputFile = Platform.script.resolve('../lib/file_system.dart').path; + var inputFile = + Platform.script.resolve('../lib/src/api_prototype/file_system.dart').path; for (var id in benchIds) { print('=== legacy for $id $inputFile'); await m.main(['--legacy', id, inputFile]); diff --git a/pkg/front_end/tool/incremental_perf.dart b/pkg/front_end/tool/incremental_perf.dart index 09065e9fb36..a22bebbd93f 100644 --- a/pkg/front_end/tool/incremental_perf.dart +++ b/pkg/front_end/tool/incremental_perf.dart @@ -47,12 +47,13 @@ import 'dart:convert'; import 'dart:io' hide FileSystemEntity; import 'package:args/args.dart'; -import 'package:front_end/byte_store.dart'; -import 'package:front_end/file_system.dart' show FileSystemEntity; -import 'package:front_end/front_end.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; -import 'package:front_end/memory_file_system.dart'; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/byte_store.dart'; +import 'package:front_end/src/api_prototype/file_system.dart' + show FileSystemEntity; +import 'package:front_end/src/api_prototype/front_end.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/byte_store/protected_file_byte_store.dart'; import 'package:front_end/src/fasta/uri_translator.dart'; diff --git a/pkg/front_end/tool/perf_common.dart b/pkg/front_end/tool/perf_common.dart index 9dab54af476..60feee3adb6 100644 --- a/pkg/front_end/tool/perf_common.dart +++ b/pkg/front_end/tool/perf_common.dart @@ -7,7 +7,7 @@ library front_end.tool.perf_common; import 'dart:io'; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/fasta/fasta_codes.dart'; /// Error messages that we temporarily allow when compiling benchmarks in strong diff --git a/pkg/front_end/tool/perf_test.dart b/pkg/front_end/tool/perf_test.dart index dc046e41e48..678c69bb853 100644 --- a/pkg/front_end/tool/perf_test.dart +++ b/pkg/front_end/tool/perf_test.dart @@ -9,7 +9,8 @@ import 'perf.dart' as m; main() async { var benchIds = ['scan', 'parse', 'linked_summarize']; - var inputFile = Platform.script.resolve('../lib/file_system.dart').path; + var inputFile = + Platform.script.resolve('../lib/src/api_prototype/file_system.dart').path; for (var id in benchIds) { await m.main([id, inputFile]); } diff --git a/pkg/vm/bin/kernel_service.dart b/pkg/vm/bin/kernel_service.dart index b829d2eb256..2b234dd77c0 100644 --- a/pkg/vm/bin/kernel_service.dart +++ b/pkg/vm/bin/kernel_service.dart @@ -25,11 +25,11 @@ import 'dart:io' show Platform hide FileSystemEntity; import 'dart:isolate'; import 'dart:typed_data' show Uint8List; -import 'package:front_end/file_system.dart'; -import 'package:front_end/front_end.dart'; -import 'package:front_end/incremental_kernel_generator.dart'; -import 'package:front_end/memory_file_system.dart'; -import 'package:front_end/physical_file_system.dart'; +import 'package:front_end/src/api_prototype/file_system.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; +import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; +import 'package:front_end/src/api_prototype/memory_file_system.dart'; +import 'package:front_end/src/api_prototype/physical_file_system.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart' show computePlatformBinariesLocation; import 'package:front_end/src/fasta/kernel/utils.dart'; diff --git a/pkg/vm/lib/kernel_front_end.dart b/pkg/vm/lib/kernel_front_end.dart index 95ff7d83528..97b0cebd0e3 100644 --- a/pkg/vm/lib/kernel_front_end.dart +++ b/pkg/vm/lib/kernel_front_end.dart @@ -7,8 +7,9 @@ library vm.kernel_front_end; import 'dart:async'; -import 'package:front_end/compiler_options.dart'; -import 'package:front_end/kernel_generator.dart' show kernelForProgram; +import 'package:front_end/src/api_prototype/compiler_options.dart'; +import 'package:front_end/src/api_prototype/kernel_generator.dart' + show kernelForProgram; import 'package:kernel/ast.dart' show Program; import 'package:kernel/core_types.dart' show CoreTypes; diff --git a/tests/compiler/dart2js/dill_loader_test.dart b/tests/compiler/dart2js/dill_loader_test.dart index 94119295177..148dca363e9 100644 --- a/tests/compiler/dart2js/dill_loader_test.dart +++ b/tests/compiler/dart2js/dill_loader_test.dart @@ -15,7 +15,7 @@ import 'package:compiler/src/library_loader.dart' show ScriptLoader; import 'package:compiler/src/script.dart' show Script; import 'package:compiler/src/apiimpl.dart' show CompilerImpl; import "package:expect/expect.dart"; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/fasta/kernel/utils.dart' show serializeProgram; import 'package:compiler/src/kernel/dart2js_target.dart'; import 'package:kernel/target/targets.dart' show TargetFlags; diff --git a/tools/patch_sdk.dart b/tools/patch_sdk.dart index 12eb14afed0..b3f9bf7c8e8 100644 --- a/tools/patch_sdk.dart +++ b/tools/patch_sdk.dart @@ -16,7 +16,7 @@ import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:path/path.dart' as path; -import 'package:front_end/front_end.dart'; +import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/kernel_generator_impl.dart';