From e40cad30a372baf3d441d5f46a3fa8d2d299f11e Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Thu, 20 Jun 2024 09:36:39 +0000 Subject: [PATCH] [cfe] Move fasta/codes/ to src/ and rename to cfe_codes* Part of removing uses of 'fasta'. TEST=existing Change-Id: Ibf144a126d8ff4ba15b6cfd2c4fb898e9a499362 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/371685 Reviewed-by: Alexander Markov Reviewed-by: Jens Johansen Commit-Queue: Johnni Winther Reviewed-by: Srujan Gaddam --- pkg/_js_interop_checks/lib/js_interop_checks.dart | 2 +- .../lib/src/transformations/shared_interop_transformer.dart | 2 +- .../src/transformations/static_interop_mock_validator.dart | 2 +- pkg/front_end/lib/src/api_unstable/vm.dart | 2 +- pkg/front_end/lib/src/base/processed_options.dart | 2 +- .../{fasta/codes/fasta_codes.dart => codes/cfe_codes.dart} | 4 +--- .../cfe_codes_generated.dart} | 2 +- .../lib/src/{fasta => }/codes/denylisted_classes.dart | 0 pkg/front_end/lib/src/{fasta => }/codes/type_labeler.dart | 2 +- .../lib/src/fasta/builder/declaration_builders.dart | 2 +- .../lib/src/fasta/builder/function_type_builder.dart | 2 +- pkg/front_end/lib/src/fasta/builder/named_type_builder.dart | 2 +- pkg/front_end/lib/src/fasta/builder/prefix_builder.dart | 2 +- .../lib/src/fasta/builder/record_type_builder.dart | 2 +- pkg/front_end/lib/src/fasta/command_line_reporting.dart | 2 +- pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart | 2 +- pkg/front_end/lib/src/fasta/dill/dill_loader.dart | 2 +- pkg/front_end/lib/src/fasta/ignored_parser_errors.dart | 2 +- pkg/front_end/lib/src/fasta/incremental_compiler.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/body_builder.dart | 4 ++-- pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/constant_int_folder.dart | 2 +- .../lib/src/fasta/kernel/expression_generator.dart | 2 +- .../lib/src/fasta/kernel/expression_generator_helper.dart | 2 +- .../lib/src/fasta/kernel/hierarchy/hierarchy_node.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/kernel_constants.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/macro/macro.dart | 2 +- .../lib/src/fasta/kernel/static_weak_references.dart | 2 +- .../lib/src/fasta/kernel/try_constant_evaluator.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/type_algorithms.dart | 2 +- pkg/front_end/lib/src/fasta/kernel/verifier.dart | 2 +- pkg/front_end/lib/src/fasta/messages.dart | 2 +- pkg/front_end/lib/src/fasta/scope.dart | 2 +- pkg/front_end/lib/src/fasta/source/class_declaration.dart | 2 +- pkg/front_end/lib/src/fasta/source/diet_listener.dart | 2 +- pkg/front_end/lib/src/fasta/source/directive_listener.dart | 2 +- pkg/front_end/lib/src/fasta/source/offset_map.dart | 2 +- pkg/front_end/lib/src/fasta/source/outline_builder.dart | 2 +- .../lib/src/fasta/source/source_class_builder.dart | 2 +- pkg/front_end/lib/src/fasta/source/source_enum_builder.dart | 2 +- .../lib/src/fasta/source/source_extension_builder.dart | 2 +- .../lib/src/fasta/source/source_factory_builder.dart | 2 +- .../lib/src/fasta/source/source_field_builder.dart | 2 +- .../lib/src/fasta/source/source_library_builder.dart | 2 +- pkg/front_end/lib/src/fasta/source/source_loader.dart | 4 ++-- .../lib/src/fasta/source/source_type_alias_builder.dart | 2 +- pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart | 2 +- .../lib/src/fasta/type_inference/closure_context.dart | 2 +- pkg/front_end/lib/src/fasta/type_inference/for_in.dart | 2 +- .../lib/src/fasta/type_inference/inference_helper.dart | 2 +- .../lib/src/fasta/type_inference/inference_results.dart | 2 +- .../lib/src/fasta/type_inference/inference_visitor.dart | 2 +- .../src/fasta/type_inference/inference_visitor_base.dart | 2 +- .../lib/src/fasta/type_inference/shared_type_analyzer.dart | 2 +- pkg/front_end/lib/src/fasta/uri_translator.dart | 2 +- pkg/front_end/lib/src/fasta/util/textual_outline.dart | 2 +- pkg/front_end/lib/src/kernel_generator_impl.dart | 2 +- pkg/front_end/lib/src/testing/analysis_helper.dart | 2 +- pkg/front_end/lib/src/testing/verifying_analysis.dart | 2 +- pkg/front_end/presubmit_helper.dart | 2 +- pkg/front_end/test/coverage_suite_expected.dart | 4 ++-- pkg/front_end/test/explicit_creation_impl.dart | 2 +- pkg/front_end/test/fasta/generator_to_string_test.dart | 2 +- pkg/front_end/test/fasta/super_mixins_test.dart | 2 +- pkg/front_end/test/fasta/tool_git_test.dart | 3 +-- .../test/incremental_load_from_invalid_dill_test.dart | 2 +- pkg/front_end/test/incremental_suite.dart | 2 +- pkg/front_end/test/kernel_generator_test.dart | 2 +- pkg/front_end/test/lint_test.status | 3 ++- pkg/front_end/test/messages_json_test.dart | 2 +- pkg/front_end/test/parser_test_parser.dart | 2 +- pkg/front_end/test/parser_test_parser_creator.dart | 2 +- pkg/front_end/test/scanner_fasta_test.dart | 2 +- pkg/front_end/test/src/base/processed_options_test.dart | 2 +- pkg/front_end/test/type_labeler_test.dart | 2 +- pkg/front_end/testing.json | 4 ++-- pkg/front_end/tool/_fasta/additional_targets_test.dart | 2 +- pkg/front_end/tool/_fasta/command_line.dart | 2 +- pkg/front_end/tool/_fasta/entry_points.dart | 2 +- pkg/front_end/tool/_fasta/generate_messages_lib.dart | 6 +++--- pkg/front_end/tool/dart_doctest_impl.dart | 2 +- pkg/front_end/tool/perf_common.dart | 2 +- pkg/kernel/problems.md | 2 +- pkg/vm/lib/modular/transformations/deeply_immutable.dart | 2 +- pkg/vm/lib/modular/transformations/ffi/common.dart | 2 +- pkg/vm/lib/modular/transformations/ffi/definitions.dart | 2 +- pkg/vm/lib/modular/transformations/ffi/native.dart | 2 +- pkg/vm/lib/modular/transformations/ffi/use_sites.dart | 2 +- 89 files changed, 95 insertions(+), 97 deletions(-) rename pkg/front_end/lib/src/{fasta/codes/fasta_codes.dart => codes/cfe_codes.dart} (91%) rename pkg/front_end/lib/src/{fasta/codes/fasta_codes_cfe_generated.dart => codes/cfe_codes_generated.dart} (99%) rename pkg/front_end/lib/src/{fasta => }/codes/denylisted_classes.dart (100%) rename pkg/front_end/lib/src/{fasta => }/codes/type_labeler.dart (99%) diff --git a/pkg/_js_interop_checks/lib/js_interop_checks.dart b/pkg/_js_interop_checks/lib/js_interop_checks.dart index 41b8e5556eb..f881199fa9d 100644 --- a/pkg/_js_interop_checks/lib/js_interop_checks.dart +++ b/pkg/_js_interop_checks/lib/js_interop_checks.dart @@ -45,7 +45,7 @@ import 'package:_js_interop_checks/src/transformations/export_checker.dart'; import 'package:_js_interop_checks/src/transformations/js_util_optimizer.dart'; // Used for importing CFE utility functions for constructor tear-offs. import 'package:front_end/src/api_prototype/lowering_predicates.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show templateJsInteropExtensionTypeNotInterop, templateJsInteropFunctionToJSRequiresStaticType, diff --git a/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart b/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart index 67f8b0b8de9..8f677dead4f 100644 --- a/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart +++ b/pkg/_js_interop_checks/lib/src/transformations/shared_interop_transformer.dart @@ -11,7 +11,7 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart' import 'package:_js_interop_checks/js_interop_checks.dart' show JsInteropDiagnosticReporter; import 'package:_js_interop_checks/src/js_interop.dart' as js_interop; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show templateJsInteropExportInvalidInteropTypeArgument, templateJsInteropExportInvalidTypeArgument, diff --git a/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart b/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart index 5005198fa5c..b849fbe7127 100644 --- a/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart +++ b/pkg/_js_interop_checks/lib/src/transformations/static_interop_mock_validator.dart @@ -11,7 +11,7 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart' import 'package:_js_interop_checks/js_interop_checks.dart' show JsInteropDiagnosticReporter; import 'package:_js_interop_checks/src/js_interop.dart' as js_interop; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show templateJsInteropStaticInteropMockNotStaticInteropType, templateJsInteropStaticInteropMockTypeParametersNotAllowed; diff --git a/pkg/front_end/lib/src/api_unstable/vm.dart b/pkg/front_end/lib/src/api_unstable/vm.dart index 56a0d506c57..ebb774c7490 100644 --- a/pkg/front_end/lib/src/api_unstable/vm.dart +++ b/pkg/front_end/lib/src/api_unstable/vm.dart @@ -41,7 +41,7 @@ export '../base/nnbd_mode.dart' show NnbdMode; export '../base/processed_options.dart' show ProcessedOptions; export '../compute_platform_binaries_location.dart' show computePlatformBinariesLocation; -export '../fasta/codes/fasta_codes.dart' +export '../codes/cfe_codes.dart' show LocatedMessage, messageFfiAbiSpecificIntegerInvalid, diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index d38a0eeae30..a697d9e9b46 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -40,7 +40,7 @@ import '../api_prototype/file_system.dart' show FileSystem, FileSystemEntity, FileSystemException; import '../api_prototype/terminal_color_support.dart' show printDiagnosticMessage; -import '../fasta/codes/fasta_codes.dart' +import '../codes/cfe_codes.dart' show FormattedMessage, LocatedMessage, diff --git a/pkg/front_end/lib/src/fasta/codes/fasta_codes.dart b/pkg/front_end/lib/src/codes/cfe_codes.dart similarity index 91% rename from pkg/front_end/lib/src/fasta/codes/fasta_codes.dart rename to pkg/front_end/lib/src/codes/cfe_codes.dart index 6fa9f504f4f..49925d28eb5 100644 --- a/pkg/front_end/lib/src/fasta/codes/fasta_codes.dart +++ b/pkg/front_end/lib/src/codes/cfe_codes.dart @@ -2,8 +2,6 @@ // 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 fasta.codes; - import 'package:_fe_analyzer_shared/src/messages/codes.dart' hide demangleMixinApplicationName; import 'package:_fe_analyzer_shared/src/messages/severity.dart'; @@ -16,4 +14,4 @@ export 'package:_fe_analyzer_shared/src/messages/codes.dart' hide demangleMixinApplicationName; export 'package:_fe_analyzer_shared/src/messages/severity.dart'; -part 'fasta_codes_cfe_generated.dart'; +part 'cfe_codes_generated.dart'; diff --git a/pkg/front_end/lib/src/fasta/codes/fasta_codes_cfe_generated.dart b/pkg/front_end/lib/src/codes/cfe_codes_generated.dart similarity index 99% rename from pkg/front_end/lib/src/fasta/codes/fasta_codes_cfe_generated.dart rename to pkg/front_end/lib/src/codes/cfe_codes_generated.dart index 692ae73f37a..cd08e5ceb13 100644 --- a/pkg/front_end/lib/src/fasta/codes/fasta_codes_cfe_generated.dart +++ b/pkg/front_end/lib/src/codes/cfe_codes_generated.dart @@ -9,7 +9,7 @@ // ignore_for_file: lines_longer_than_80_chars -part of fasta.codes; +part of 'cfe_codes.dart'; // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE. const Template diff --git a/pkg/front_end/lib/src/fasta/codes/denylisted_classes.dart b/pkg/front_end/lib/src/codes/denylisted_classes.dart similarity index 100% rename from pkg/front_end/lib/src/fasta/codes/denylisted_classes.dart rename to pkg/front_end/lib/src/codes/denylisted_classes.dart diff --git a/pkg/front_end/lib/src/fasta/codes/type_labeler.dart b/pkg/front_end/lib/src/codes/type_labeler.dart similarity index 99% rename from pkg/front_end/lib/src/fasta/codes/type_labeler.dart rename to pkg/front_end/lib/src/codes/type_labeler.dart index b826a2fc0ad..c554c18e489 100644 --- a/pkg/front_end/lib/src/fasta/codes/type_labeler.dart +++ b/pkg/front_end/lib/src/codes/type_labeler.dart @@ -7,7 +7,7 @@ import 'dart:convert' show json; import 'package:kernel/ast.dart'; import 'denylisted_classes.dart' show denylistedCoreClasses; -import 'fasta_codes.dart' +import 'cfe_codes.dart' show Message, templateTypeOrigin, templateTypeOriginWithFileUri; /// A pretty-printer for Kernel types and constants with the ability to label diff --git a/pkg/front_end/lib/src/fasta/builder/declaration_builders.dart b/pkg/front_end/lib/src/fasta/builder/declaration_builders.dart index 57684589288..19fb1b8c635 100644 --- a/pkg/front_end/lib/src/fasta/builder/declaration_builders.dart +++ b/pkg/front_end/lib/src/fasta/builder/declaration_builders.dart @@ -7,7 +7,7 @@ import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/src/bounds_checks.dart'; import 'package:kernel/src/unaliasing.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/body_builder_context.dart'; import '../loader.dart'; import '../messages.dart'; diff --git a/pkg/front_end/lib/src/fasta/builder/function_type_builder.dart b/pkg/front_end/lib/src/fasta/builder/function_type_builder.dart index 31bea797d5b..14f4814102b 100644 --- a/pkg/front_end/lib/src/fasta/builder/function_type_builder.dart +++ b/pkg/front_end/lib/src/fasta/builder/function_type_builder.dart @@ -9,7 +9,7 @@ import 'package:kernel/ast.dart' import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/src/unaliasing.dart'; -import '../codes/fasta_codes.dart' show messageSupertypeIsFunction, noLength; +import '../../codes/cfe_codes.dart' show messageSupertypeIsFunction, noLength; import '../kernel/implicit_field_type.dart'; import '../source/source_library_builder.dart'; import 'declaration_builders.dart'; diff --git a/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart b/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart index 62687179e1a..af7daf30617 100644 --- a/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart +++ b/pkg/front_end/lib/src/fasta/builder/named_type_builder.dart @@ -9,7 +9,7 @@ import 'package:kernel/ast.dart'; import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/src/unaliasing.dart' as unaliasing; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Message, diff --git a/pkg/front_end/lib/src/fasta/builder/prefix_builder.dart b/pkg/front_end/lib/src/fasta/builder/prefix_builder.dart index 400975b94cb..c986a85eb2d 100644 --- a/pkg/front_end/lib/src/fasta/builder/prefix_builder.dart +++ b/pkg/front_end/lib/src/fasta/builder/prefix_builder.dart @@ -6,7 +6,7 @@ library fasta.prefix_builder; import 'package:kernel/ast.dart' show LibraryDependency; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/load_library_builder.dart' show LoadLibraryBuilder; import '../scope.dart'; import '../source/source_library_builder.dart'; diff --git a/pkg/front_end/lib/src/fasta/builder/record_type_builder.dart b/pkg/front_end/lib/src/fasta/builder/record_type_builder.dart index 91c447ecec5..5ff4c2d4127 100644 --- a/pkg/front_end/lib/src/fasta/builder/record_type_builder.dart +++ b/pkg/front_end/lib/src/fasta/builder/record_type_builder.dart @@ -7,7 +7,7 @@ import 'package:kernel/ast.dart' import 'package:kernel/class_hierarchy.dart'; import 'package:kernel/src/unaliasing.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show messageNamedFieldClashesWithPositionalFieldInRecord, messageObjectMemberNameUsedForRecordField, diff --git a/pkg/front_end/lib/src/fasta/command_line_reporting.dart b/pkg/front_end/lib/src/fasta/command_line_reporting.dart index fa57d376f86..15a9427c9b1 100644 --- a/pkg/front_end/lib/src/fasta/command_line_reporting.dart +++ b/pkg/front_end/lib/src/fasta/command_line_reporting.dart @@ -22,7 +22,7 @@ import 'package:_fe_analyzer_shared/src/util/relativize.dart' import 'package:kernel/ast.dart' show Location, Source, TreeNode; import '../compute_platform_binaries_location.dart' show translateSdk; -import 'codes/fasta_codes.dart' show LocatedMessage, PlainAndColorizedString; +import '../codes/cfe_codes.dart' show LocatedMessage, PlainAndColorizedString; import 'compiler_context.dart' show CompilerContext; import 'crash.dart' show Crash, safeToString; import 'messages.dart' show getLocation, getSourceLine; diff --git a/pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart b/pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart index ec4853bf36e..a81ca915ad3 100644 --- a/pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart +++ b/pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart @@ -17,7 +17,7 @@ import '../builder/library_builder.dart'; import '../builder/member_builder.dart'; import '../builder/name_iterator.dart'; import '../builder/never_type_declaration_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Message, diff --git a/pkg/front_end/lib/src/fasta/dill/dill_loader.dart b/pkg/front_end/lib/src/fasta/dill/dill_loader.dart index e15b090765c..031bab36336 100644 --- a/pkg/front_end/lib/src/fasta/dill/dill_loader.dart +++ b/pkg/front_end/lib/src/fasta/dill/dill_loader.dart @@ -13,7 +13,7 @@ import 'package:kernel/ast.dart' import '../builder/declaration_builders.dart'; import '../builder/library_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show SummaryTemplate, Template, templateDillOutlineSummary; import '../crash.dart' show firstSourceUri; import '../kernel/type_builder_computer.dart' show TypeBuilderComputer; diff --git a/pkg/front_end/lib/src/fasta/ignored_parser_errors.dart b/pkg/front_end/lib/src/fasta/ignored_parser_errors.dart index e3e06839929..837cd625b60 100644 --- a/pkg/front_end/lib/src/fasta/ignored_parser_errors.dart +++ b/pkg/front_end/lib/src/fasta/ignored_parser_errors.dart @@ -7,7 +7,7 @@ library fasta.ignored_parser_errors; import 'package:_fe_analyzer_shared/src/parser/parser.dart' show optional; import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token; -import 'codes/fasta_codes.dart' show Code, codeNonPartOfDirectiveInPart; +import '../codes/cfe_codes.dart' show Code, codeNonPartOfDirectiveInPart; bool isIgnoredParserError(Code code, Token token) { if (code == codeNonPartOfDirectiveInPart) { diff --git a/pkg/front_end/lib/src/fasta/incremental_compiler.dart b/pkg/front_end/lib/src/fasta/incremental_compiler.dart index a66501b9c60..52fef32d1dd 100644 --- a/pkg/front_end/lib/src/fasta/incremental_compiler.dart +++ b/pkg/front_end/lib/src/fasta/incremental_compiler.dart @@ -80,7 +80,7 @@ import 'builder/library_builder.dart' show CompilationUnit, LibraryBuilder; import 'builder/member_builder.dart' show MemberBuilder; import 'builder/name_iterator.dart' show NameIterator; import 'builder_graph.dart' show BuilderGraph; -import 'codes/fasta_codes.dart'; +import '../codes/cfe_codes.dart'; import 'combinator.dart' show CombinatorBuilder; import 'compiler_context.dart' show CompilerContext; import 'dill/dill_class_builder.dart' show DillClassBuilder; diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart index 8fe3a22a649..e955464b354 100644 --- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart +++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart @@ -59,7 +59,7 @@ import '../builder/record_type_builder.dart'; import '../builder/type_builder.dart'; import '../builder/variable_builder.dart'; import '../builder/void_type_declaration_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Message, @@ -71,7 +71,7 @@ import '../codes/fasta_codes.dart' templateExperimentNotEnabledOffByDefault, templateLocalVariableUsedBeforeDeclared, templateLocalVariableUsedBeforeDeclaredContext; -import '../codes/fasta_codes.dart' as fasta; +import '../../codes/cfe_codes.dart' as fasta; import '../constant_context.dart' show ConstantContext; import '../dill/dill_library_builder.dart' show DillLibraryBuilder; import '../identifiers.dart' diff --git a/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart b/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart index 6967d7fd23a..773db5503e2 100644 --- a/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart +++ b/pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart @@ -38,7 +38,7 @@ import 'package:kernel/type_environment.dart'; import '../../api_prototype/lowering_predicates.dart'; import '../../base/nnbd_mode.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../type_inference/delayed_expressions.dart'; import '../type_inference/external_ast_helper.dart'; import '../type_inference/matching_cache.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/constant_int_folder.dart b/pkg/front_end/lib/src/fasta/kernel/constant_int_folder.dart index b7c881a22fc..e23f68b3cac 100644 --- a/pkg/front_end/lib/src/fasta/kernel/constant_int_folder.dart +++ b/pkg/front_end/lib/src/fasta/kernel/constant_int_folder.dart @@ -5,7 +5,7 @@ import 'package:kernel/ast.dart'; import 'package:kernel/target/targets.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import 'constant_evaluator.dart'; abstract class ConstantIntFolder { diff --git a/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart b/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart index de17c303c5c..475a5b87a30 100644 --- a/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart +++ b/pkg/front_end/lib/src/fasta/kernel/expression_generator.dart @@ -41,7 +41,7 @@ import '../builder/nullability_builder.dart'; import '../builder/omitted_type_builder.dart'; import '../builder/prefix_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../constant_context.dart' show ConstantContext; import '../problems.dart'; import '../scope.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/expression_generator_helper.dart b/pkg/front_end/lib/src/fasta/kernel/expression_generator_helper.dart index fd85d7b6200..33710a092eb 100644 --- a/pkg/front_end/lib/src/fasta/kernel/expression_generator_helper.dart +++ b/pkg/front_end/lib/src/fasta/kernel/expression_generator_helper.dart @@ -16,7 +16,7 @@ import '../builder/formal_parameter_builder.dart'; import '../builder/named_type_builder.dart'; import '../builder/prefix_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' show LocatedMessage; +import '../../codes/cfe_codes.dart' show LocatedMessage; import '../constant_context.dart' show ConstantContext; import '../messages.dart' show Message; import '../scope.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/hierarchy/hierarchy_node.dart b/pkg/front_end/lib/src/fasta/kernel/hierarchy/hierarchy_node.dart index 4da6618327d..e17f93e3f94 100644 --- a/pkg/front_end/lib/src/fasta/kernel/hierarchy/hierarchy_node.dart +++ b/pkg/front_end/lib/src/fasta/kernel/hierarchy/hierarchy_node.dart @@ -15,7 +15,7 @@ import '../../builder/declaration_builders.dart'; import '../../builder/library_builder.dart'; import '../../builder/named_type_builder.dart'; import '../../builder/type_builder.dart'; -import '../../codes/fasta_codes.dart'; +import '../../../codes/cfe_codes.dart'; import '../../source/source_library_builder.dart'; import '../../type_inference/type_schema.dart' show UnknownType; import 'hierarchy_builder.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart b/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart index d354a1e0d45..f8fa0343b48 100644 --- a/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart +++ b/pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart @@ -13,7 +13,7 @@ import 'package:kernel/src/printer.dart'; import '../builder/builder.dart'; import '../builder/inferable_type_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../constant_context.dart'; import '../problems.dart' show unsupported; import '../source/source_field_builder.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_constants.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_constants.dart index a0b31d8d935..13683b0b451 100644 --- a/pkg/front_end/lib/src/fasta/kernel/kernel_constants.dart +++ b/pkg/front_end/lib/src/fasta/kernel/kernel_constants.dart @@ -5,7 +5,7 @@ library fasta.kernel_constants; import '../builder/library_builder.dart'; -import '../codes/fasta_codes.dart' show LocatedMessage; +import '../../codes/cfe_codes.dart' show LocatedMessage; import '../source/source_loader.dart' show SourceLoader; import 'constant_evaluator.dart' show ErrorReporter; diff --git a/pkg/front_end/lib/src/fasta/kernel/macro/macro.dart b/pkg/front_end/lib/src/fasta/kernel/macro/macro.dart index af4eb5a8d20..61002f332fd 100644 --- a/pkg/front_end/lib/src/fasta/kernel/macro/macro.dart +++ b/pkg/front_end/lib/src/fasta/kernel/macro/macro.dart @@ -18,7 +18,7 @@ import '../../builder/declaration_builders.dart'; import '../../builder/member_builder.dart'; import '../../builder/prefix_builder.dart'; import '../../builder/type_builder.dart'; -import '../../codes/fasta_codes.dart'; +import '../../../codes/cfe_codes.dart'; import '../../source/source_class_builder.dart'; import '../../source/source_constructor_builder.dart'; import '../../source/source_extension_builder.dart'; diff --git a/pkg/front_end/lib/src/fasta/kernel/static_weak_references.dart b/pkg/front_end/lib/src/fasta/kernel/static_weak_references.dart index e1f9b6f8b24..b202217ac80 100644 --- a/pkg/front_end/lib/src/fasta/kernel/static_weak_references.dart +++ b/pkg/front_end/lib/src/fasta/kernel/static_weak_references.dart @@ -7,7 +7,7 @@ import 'package:kernel/ast.dart'; import 'package:kernel/core_types.dart' show CoreTypes; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show messageWeakReferenceNotStatic, messageWeakReferenceNotOneArgument, diff --git a/pkg/front_end/lib/src/fasta/kernel/try_constant_evaluator.dart b/pkg/front_end/lib/src/fasta/kernel/try_constant_evaluator.dart index b28442cc4a0..c65fa69a2e9 100644 --- a/pkg/front_end/lib/src/fasta/kernel/try_constant_evaluator.dart +++ b/pkg/front_end/lib/src/fasta/kernel/try_constant_evaluator.dart @@ -6,7 +6,7 @@ import 'package:kernel/ast.dart'; import 'package:kernel/target/targets.dart'; import 'package:kernel/type_environment.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import 'constant_evaluator.dart'; typedef ReportErrorFunction = void Function( diff --git a/pkg/front_end/lib/src/fasta/kernel/type_algorithms.dart b/pkg/front_end/lib/src/fasta/kernel/type_algorithms.dart index e1df2a1d0be..5187230f49c 100644 --- a/pkg/front_end/lib/src/fasta/kernel/type_algorithms.dart +++ b/pkg/front_end/lib/src/fasta/kernel/type_algorithms.dart @@ -16,7 +16,7 @@ import '../builder/named_type_builder.dart'; import '../builder/nullability_builder.dart'; import '../builder/record_type_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Message, diff --git a/pkg/front_end/lib/src/fasta/kernel/verifier.dart b/pkg/front_end/lib/src/fasta/kernel/verifier.dart index 5fe64465f11..397be946d1c 100644 --- a/pkg/front_end/lib/src/fasta/kernel/verifier.dart +++ b/pkg/front_end/lib/src/fasta/kernel/verifier.dart @@ -10,7 +10,7 @@ import 'package:kernel/target/targets.dart'; import 'package:kernel/type_environment.dart' show TypeEnvironment; import 'package:kernel/verifier.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Message, diff --git a/pkg/front_end/lib/src/fasta/messages.dart b/pkg/front_end/lib/src/fasta/messages.dart index f5bb5466e2b..3415f0ec438 100644 --- a/pkg/front_end/lib/src/fasta/messages.dart +++ b/pkg/front_end/lib/src/fasta/messages.dart @@ -8,7 +8,7 @@ import 'package:kernel/ast.dart' show Location, Source; import 'compiler_context.dart' show CompilerContext; -export 'codes/fasta_codes.dart'; +export '../codes/cfe_codes.dart'; Location? getLocation(Uri uri, int charOffset) { return CompilerContext.current.uriToSource[uri]?.getLocation(uri, charOffset); diff --git a/pkg/front_end/lib/src/fasta/scope.dart b/pkg/front_end/lib/src/fasta/scope.dart index e636bab4c34..24d505eb59c 100644 --- a/pkg/front_end/lib/src/fasta/scope.dart +++ b/pkg/front_end/lib/src/fasta/scope.dart @@ -14,7 +14,7 @@ import 'builder/library_builder.dart'; import 'builder/member_builder.dart'; import 'builder/metadata_builder.dart'; import 'builder/name_iterator.dart'; -import 'codes/fasta_codes.dart'; +import '../codes/cfe_codes.dart'; import 'kernel/body_builder.dart' show JumpTarget; import 'kernel/body_builder_context.dart'; import 'kernel/hierarchy/class_member.dart' show ClassMember; diff --git a/pkg/front_end/lib/src/fasta/source/class_declaration.dart b/pkg/front_end/lib/src/fasta/source/class_declaration.dart index cfd979a3e76..147d3eb5032 100644 --- a/pkg/front_end/lib/src/fasta/source/class_declaration.dart +++ b/pkg/front_end/lib/src/fasta/source/class_declaration.dart @@ -11,7 +11,7 @@ import '../builder/function_builder.dart'; import '../builder/member_builder.dart'; import '../builder/name_iterator.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../dill/dill_member_builder.dart'; import '../problems.dart'; import '../scope.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/diet_listener.dart b/pkg/front_end/lib/src/fasta/source/diet_listener.dart index 7bd81e16201..8b7ba0a3d88 100644 --- a/pkg/front_end/lib/src/fasta/source/diet_listener.dart +++ b/pkg/front_end/lib/src/fasta/source/diet_listener.dart @@ -23,7 +23,7 @@ import 'package:kernel/core_types.dart' show CoreTypes; import '../builder/builder.dart'; import '../builder/declaration_builders.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show Code, LocatedMessage, Message, messageExpectedBlockToSkip; import '../constant_context.dart' show ConstantContext; import '../crash.dart' show Crash; diff --git a/pkg/front_end/lib/src/fasta/source/directive_listener.dart b/pkg/front_end/lib/src/fasta/source/directive_listener.dart index 7d9cd6cbdcb..7fc28148039 100644 --- a/pkg/front_end/lib/src/fasta/source/directive_listener.dart +++ b/pkg/front_end/lib/src/fasta/source/directive_listener.dart @@ -11,7 +11,7 @@ import 'package:_fe_analyzer_shared/src/parser/listener.dart'; import 'package:_fe_analyzer_shared/src/parser/quote.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token; -import '../codes/fasta_codes.dart' show messageExpectedBlockToSkip; +import '../../codes/cfe_codes.dart' show messageExpectedBlockToSkip; /// Listener that records imports, exports, and part directives. /// diff --git a/pkg/front_end/lib/src/fasta/source/offset_map.dart b/pkg/front_end/lib/src/fasta/source/offset_map.dart index 363c056bed9..d3f1671e449 100644 --- a/pkg/front_end/lib/src/fasta/source/offset_map.dart +++ b/pkg/front_end/lib/src/fasta/source/offset_map.dart @@ -6,7 +6,7 @@ import 'package:_fe_analyzer_shared/src/scanner/token.dart'; import 'package:kernel/ast.dart'; import '../builder/builder.dart'; import '../builder/declaration_builders.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../export.dart'; import '../identifiers.dart'; import '../import.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart index 58543810e52..9cc72bab782 100644 --- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart @@ -41,7 +41,7 @@ import '../builder/nullability_builder.dart'; import '../builder/omitted_type_builder.dart'; import '../builder/record_type_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../combinator.dart' show CombinatorBuilder; import '../configuration.dart' show Configuration; import '../identifiers.dart' diff --git a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart index f16c8c6e588..1ff5a723c2d 100644 --- a/pkg/front_end/lib/src/fasta/source/source_class_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_class_builder.dart @@ -34,7 +34,7 @@ import '../builder/never_type_declaration_builder.dart'; import '../builder/nullability_builder.dart'; import '../builder/type_builder.dart'; import '../builder/void_type_declaration_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/body_builder_context.dart'; import '../kernel/hierarchy/hierarchy_builder.dart'; import '../kernel/hierarchy/hierarchy_node.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/source_enum_builder.dart b/pkg/front_end/lib/src/fasta/source/source_enum_builder.dart index 8df142e5284..0219a04cd93 100644 --- a/pkg/front_end/lib/src/fasta/source/source_enum_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_enum_builder.dart @@ -24,7 +24,7 @@ import '../builder/named_type_builder.dart'; import '../builder/nullability_builder.dart'; import '../builder/procedure_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show LocatedMessage, Severity, diff --git a/pkg/front_end/lib/src/fasta/source/source_extension_builder.dart b/pkg/front_end/lib/src/fasta/source/source_extension_builder.dart index 4164048229d..4a85e88bbfb 100644 --- a/pkg/front_end/lib/src/fasta/source/source_extension_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_extension_builder.dart @@ -10,7 +10,7 @@ import '../builder/declaration_builders.dart'; import '../builder/library_builder.dart'; import '../builder/metadata_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show messagePatchDeclarationMismatch, messagePatchDeclarationOrigin, diff --git a/pkg/front_end/lib/src/fasta/source/source_factory_builder.dart b/pkg/front_end/lib/src/fasta/source/source_factory_builder.dart index 43fec208933..6ca2648230f 100644 --- a/pkg/front_end/lib/src/fasta/source/source_factory_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_factory_builder.dart @@ -15,7 +15,7 @@ import '../builder/function_builder.dart'; import '../builder/metadata_builder.dart'; import '../builder/omitted_type_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../dill/dill_extension_type_member_builder.dart'; import '../dill/dill_member_builder.dart'; import '../identifiers.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/source_field_builder.dart b/pkg/front_end/lib/src/fasta/source/source_field_builder.dart index a8998255157..49f2b1b28b2 100644 --- a/pkg/front_end/lib/src/fasta/source/source_field_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_field_builder.dart @@ -18,7 +18,7 @@ import '../builder/member_builder.dart'; import '../builder/metadata_builder.dart'; import '../builder/omitted_type_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show messageInternalProblemAlreadyInitialized; import '../constant_context.dart' show ConstantContext; import '../kernel/body_builder.dart' show BodyBuilder; diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart index 8d8de9d1667..3e72e0f2b13 100644 --- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart @@ -57,7 +57,7 @@ import '../builder/procedure_builder.dart'; import '../builder/record_type_builder.dart'; import '../builder/type_builder.dart'; import '../builder/void_type_declaration_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../combinator.dart' show CombinatorBuilder; import '../configuration.dart' show Configuration; import '../export.dart' show Export; 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 dad7dbf9b4c..c8380825640 100644 --- a/pkg/front_end/lib/src/fasta/source/source_loader.dart +++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart @@ -49,9 +49,9 @@ import '../builder/nullability_builder.dart'; import '../builder/omitted_type_builder.dart'; import '../builder/type_builder.dart'; import '../builder_graph.dart'; -import '../codes/denylisted_classes.dart' +import '../../codes/denylisted_classes.dart' show denylistedCoreClasses, denylistedTypedDataClasses; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../dill/dill_library_builder.dart'; import '../export.dart' show Export; import '../import_chains.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/source_type_alias_builder.dart b/pkg/front_end/lib/src/fasta/source/source_type_alias_builder.dart index 5e17538532e..575442446a9 100644 --- a/pkg/front_end/lib/src/fasta/source/source_type_alias_builder.dart +++ b/pkg/front_end/lib/src/fasta/source/source_type_alias_builder.dart @@ -17,7 +17,7 @@ import '../builder/metadata_builder.dart'; import '../builder/name_iterator.dart'; import '../builder/record_type_builder.dart'; import '../builder/type_builder.dart'; -import '../codes/fasta_codes.dart' +import '../../codes/cfe_codes.dart' show templateCyclicTypedef, templateTypeArgumentMismatch; import '../kernel/body_builder_context.dart'; import '../kernel/constructor_tearoff_lowering.dart'; diff --git a/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart b/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart index 26dcc57c9b2..e92e61a6cd7 100644 --- a/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart +++ b/pkg/front_end/lib/src/fasta/source/stack_listener_impl.dart @@ -11,7 +11,7 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token; import 'package:kernel/ast.dart'; import '../../api_prototype/experimental_flags.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../problems.dart' as problems show internalProblem, unhandled, unsupported; import 'source_library_builder.dart'; diff --git a/pkg/front_end/lib/src/fasta/type_inference/closure_context.dart b/pkg/front_end/lib/src/fasta/type_inference/closure_context.dart index a8128d626c0..7f05970e80c 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/closure_context.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/closure_context.dart @@ -6,7 +6,7 @@ import 'package:kernel/ast.dart'; import 'package:kernel/src/future_value_type.dart'; import 'package:kernel/type_environment.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/invalid_type.dart'; import 'inference_results.dart'; import 'inference_visitor_base.dart'; diff --git a/pkg/front_end/lib/src/fasta/type_inference/for_in.dart b/pkg/front_end/lib/src/fasta/type_inference/for_in.dart index 2d12c643d03..defe0ad6ef8 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/for_in.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/for_in.dart @@ -5,7 +5,7 @@ import 'package:kernel/ast.dart'; import '../../base/instrumentation.dart' show InstrumentationValueForMember; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/internal_ast.dart'; import 'inference_results.dart'; import 'inference_visitor.dart'; diff --git a/pkg/front_end/lib/src/fasta/type_inference/inference_helper.dart b/pkg/front_end/lib/src/fasta/type_inference/inference_helper.dart index 9b93bbbbdc6..5f4db3e2f42 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/inference_helper.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/inference_helper.dart @@ -4,7 +4,7 @@ import 'package:kernel/ast.dart'; -import '../codes/fasta_codes.dart' show LocatedMessage, Message; +import '../../codes/cfe_codes.dart' show LocatedMessage, Message; import '../kernel/internal_ast.dart'; abstract class InferenceHelper { diff --git a/pkg/front_end/lib/src/fasta/type_inference/inference_results.dart b/pkg/front_end/lib/src/fasta/type_inference/inference_results.dart index d1c17d9106d..6305ad1b372 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/inference_results.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/inference_results.dart @@ -5,7 +5,7 @@ import 'package:_fe_analyzer_shared/src/util/link.dart'; import 'package:kernel/ast.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/internal_ast.dart'; import 'external_ast_helper.dart'; import 'inference_helper.dart'; diff --git a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart index 44b3b5a860d..6186e1f4a0b 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor.dart @@ -27,7 +27,7 @@ import '../../base/instrumentation.dart' InstrumentationValueForMember, InstrumentationValueForType, InstrumentationValueForTypeArgs; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/body_builder.dart' show combineStatements; import '../kernel/collections.dart' show diff --git a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart index e3cd75ea231..af071a260c5 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/inference_visitor_base.dart @@ -32,7 +32,7 @@ import '../../testing/id_extractor.dart'; import '../../testing/id_testing_utils.dart'; import '../builder/declaration_builders.dart'; import '../builder/member_builder.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import '../kernel/constructor_tearoff_lowering.dart'; import '../kernel/hierarchy/class_member.dart'; import '../kernel/internal_ast.dart'; diff --git a/pkg/front_end/lib/src/fasta/type_inference/shared_type_analyzer.dart b/pkg/front_end/lib/src/fasta/type_inference/shared_type_analyzer.dart index 5075af879e0..cfb41269f36 100644 --- a/pkg/front_end/lib/src/fasta/type_inference/shared_type_analyzer.dart +++ b/pkg/front_end/lib/src/fasta/type_inference/shared_type_analyzer.dart @@ -8,7 +8,7 @@ import 'package:front_end/src/fasta/type_inference/inference_visitor.dart'; import 'package:kernel/ast.dart'; import 'package:kernel/core_types.dart'; -import '../codes/fasta_codes.dart'; +import '../../codes/cfe_codes.dart'; import 'inference_helper.dart'; /// Implementation of [TypeAnalyzerErrors] that reports errors using the diff --git a/pkg/front_end/lib/src/fasta/uri_translator.dart b/pkg/front_end/lib/src/fasta/uri_translator.dart index 2a35b24f8e4..7143f38e612 100644 --- a/pkg/front_end/lib/src/fasta/uri_translator.dart +++ b/pkg/front_end/lib/src/fasta/uri_translator.dart @@ -8,7 +8,7 @@ import 'package:_fe_analyzer_shared/src/util/libraries_specification.dart' show TargetLibrariesSpecification; import 'package:package_config/package_config.dart'; -import 'codes/fasta_codes.dart'; +import '../codes/cfe_codes.dart'; import 'compiler_context.dart' show CompilerContext; class UriTranslator { diff --git a/pkg/front_end/lib/src/fasta/util/textual_outline.dart b/pkg/front_end/lib/src/fasta/util/textual_outline.dart index af7b6e89563..e4b8e9ada14 100644 --- a/pkg/front_end/lib/src/fasta/util/textual_outline.dart +++ b/pkg/front_end/lib/src/fasta/util/textual_outline.dart @@ -19,7 +19,7 @@ import 'package:_fe_analyzer_shared/src/scanner/utf8_bytes_scanner.dart' import 'package:kernel/ast.dart' show Version; import '../../api_prototype/experimental_flags.dart' show ExperimentalFlag; -import '../codes/fasta_codes.dart' show codeNativeClauseShouldBeAnnotation; +import '../../codes/cfe_codes.dart' show codeNativeClauseShouldBeAnnotation; import '../messages.dart' show Message; abstract class _Chunk implements Comparable<_Chunk> { diff --git a/pkg/front_end/lib/src/kernel_generator_impl.dart b/pkg/front_end/lib/src/kernel_generator_impl.dart index a4526fff4df..3f2293e20f0 100644 --- a/pkg/front_end/lib/src/kernel_generator_impl.dart +++ b/pkg/front_end/lib/src/kernel_generator_impl.dart @@ -22,7 +22,7 @@ import 'api_prototype/memory_file_system.dart'; import 'base/instrumentation.dart'; import 'base/nnbd_mode.dart'; import 'base/processed_options.dart' show ProcessedOptions; -import 'fasta/codes/fasta_codes.dart' show LocatedMessage; +import 'codes/cfe_codes.dart' show LocatedMessage; import 'fasta/compiler_context.dart' show CompilerContext; import 'fasta/crash.dart' show withCrashReporting; import 'fasta/dill/dill_target.dart' show DillTarget; diff --git a/pkg/front_end/lib/src/testing/analysis_helper.dart b/pkg/front_end/lib/src/testing/analysis_helper.dart index 399c52af2b8..efcdcfe68d9 100644 --- a/pkg/front_end/lib/src/testing/analysis_helper.dart +++ b/pkg/front_end/lib/src/testing/analysis_helper.dart @@ -7,7 +7,7 @@ import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/api_prototype/kernel_generator.dart'; import 'package:front_end/src/api_prototype/terminal_color_support.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart'; +import 'package:front_end/src/codes/cfe_codes.dart'; import 'package:front_end/src/fasta/command_line_reporting.dart'; import 'package:front_end/src/kernel_generator_impl.dart'; import 'package:kernel/ast.dart'; diff --git a/pkg/front_end/lib/src/testing/verifying_analysis.dart b/pkg/front_end/lib/src/testing/verifying_analysis.dart index 9007d1ccd70..cae85a2bf99 100644 --- a/pkg/front_end/lib/src/testing/verifying_analysis.dart +++ b/pkg/front_end/lib/src/testing/verifying_analysis.dart @@ -8,7 +8,7 @@ import 'dart:io'; import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart'; import 'package:kernel/ast.dart'; -import '../fasta/codes/fasta_codes.dart'; +import '../codes/cfe_codes.dart'; import '../fasta/command_line_reporting.dart'; import 'analysis_helper.dart'; diff --git a/pkg/front_end/presubmit_helper.dart b/pkg/front_end/presubmit_helper.dart index fb9fb4dff0d..58a4b42e4bc 100644 --- a/pkg/front_end/presubmit_helper.dart +++ b/pkg/front_end/presubmit_helper.dart @@ -76,7 +76,7 @@ const Set _generatedFilesUpToDateFiles = { "pkg/_fe_analyzer_shared/lib/src/parser/listener.dart", "pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart", "pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart", - "pkg/front_end/lib/src/fasta/codes/fasta_codes_cfe_generated.dart", + "pkg/front_end/lib/src/codes/cfe_codes_generated.dart", "pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart", "pkg/front_end/messages.yaml", "pkg/front_end/test/generated_files_up_to_date_git_test.dart", diff --git a/pkg/front_end/test/coverage_suite_expected.dart b/pkg/front_end/test/coverage_suite_expected.dart index 2bdef062a93..85ea225b30d 100644 --- a/pkg/front_end/test/coverage_suite_expected.dart +++ b/pkg/front_end/test/coverage_suite_expected.dart @@ -281,12 +281,12 @@ const Map _expect = { missCount: 22, ), // 73.0892742453436%. - "package:front_end/src/fasta/codes/fasta_codes_cfe_generated.dart": ( + "package:front_end/src/codes/cfe_codes_generated.dart": ( hitCount: 1138, missCount: 419, ), // 83.68336025848141%. - "package:front_end/src/fasta/codes/type_labeler.dart": ( + "package:front_end/src/codes/type_labeler.dart": ( hitCount: 518, missCount: 101, ), diff --git a/pkg/front_end/test/explicit_creation_impl.dart b/pkg/front_end/test/explicit_creation_impl.dart index 4607ecb65de..9a74295720b 100644 --- a/pkg/front_end/test/explicit_creation_impl.dart +++ b/pkg/front_end/test/explicit_creation_impl.dart @@ -14,7 +14,7 @@ import 'package:front_end/src/api_prototype/compiler_options.dart' as api import 'package:front_end/src/fasta/builder/declaration_builders.dart' show TypeDeclarationBuilder; import 'package:front_end/src/fasta/builder/type_builder.dart' show TypeBuilder; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' as fasta +import 'package:front_end/src/codes/cfe_codes.dart' as fasta show templateUnspecified; import 'package:front_end/src/fasta/kernel/body_builder.dart' show BodyBuilder; import 'package:front_end/src/fasta/kernel/constness.dart' show Constness; diff --git a/pkg/front_end/test/fasta/generator_to_string_test.dart b/pkg/front_end/test/fasta/generator_to_string_test.dart index 91dbaa7a365..a51a772f0bf 100644 --- a/pkg/front_end/test/fasta/generator_to_string_test.dart +++ b/pkg/front_end/test/fasta/generator_to_string_test.dart @@ -10,7 +10,7 @@ import 'package:expect/expect.dart' show Expect; import 'package:front_end/src/fasta/builder/declaration_builders.dart'; import 'package:front_end/src/fasta/builder/prefix_builder.dart'; import 'package:front_end/src/fasta/builder/type_builder.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show Message, templateUnspecified; import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext; import 'package:front_end/src/fasta/dill/dill_target.dart' show DillTarget; diff --git a/pkg/front_end/test/fasta/super_mixins_test.dart b/pkg/front_end/test/fasta/super_mixins_test.dart index 1fd0d18a29a..8ac6365efb5 100644 --- a/pkg/front_end/test/fasta/super_mixins_test.dart +++ b/pkg/front_end/test/fasta/super_mixins_test.dart @@ -15,7 +15,7 @@ import 'package:async_helper/async_helper.dart' show asyncTest; import 'package:expect/expect.dart' show Expect; import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show codeSuperclassHasNoMethod; import 'package:front_end/src/testing/compiler_common.dart' show compileScript; diff --git a/pkg/front_end/test/fasta/tool_git_test.dart b/pkg/front_end/test/fasta/tool_git_test.dart index f57bb1fc400..04ad2e80ed1 100644 --- a/pkg/front_end/test/fasta/tool_git_test.dart +++ b/pkg/front_end/test/fasta/tool_git_test.dart @@ -7,8 +7,7 @@ import "dart:io"; import "package:expect/expect.dart"; -import "package:front_end/src/fasta/codes/fasta_codes.dart" - show messageFastaUsageShort; +import "package:front_end/src/codes/cfe_codes.dart" show messageFastaUsageShort; const String toolPath = "pkg/front_end/tool/fasta"; diff --git a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart index 4e84c7edc50..d9dc7715d12 100644 --- a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart +++ b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart @@ -21,7 +21,7 @@ import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; import 'package:front_end/src/compute_platform_binaries_location.dart' show computePlatformBinariesLocation; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show Code, codeInitializeFromDillNotSelfContained, diff --git a/pkg/front_end/test/incremental_suite.dart b/pkg/front_end/test/incremental_suite.dart index 2b2919a58af..933ababbad8 100644 --- a/pkg/front_end/test/incremental_suite.dart +++ b/pkg/front_end/test/incremental_suite.dart @@ -26,7 +26,7 @@ import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; import 'package:front_end/src/compute_platform_binaries_location.dart' show computePlatformBinariesLocation, computePlatformDillName; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show DiagnosticMessageFromJson, FormattedMessage; import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext; import 'package:front_end/src/fasta/incremental_compiler.dart' diff --git a/pkg/front_end/test/kernel_generator_test.dart b/pkg/front_end/test/kernel_generator_test.dart index 0edd7e0df84..d1be3cb9ad0 100644 --- a/pkg/front_end/test/kernel_generator_test.dart +++ b/pkg/front_end/test/kernel_generator_test.dart @@ -4,7 +4,7 @@ import 'package:front_end/src/api_prototype/front_end.dart' show CompilerOptions, DiagnosticMessage; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show FormattedMessage, messageMissingMain; import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent; import 'package:front_end/src/testing/compiler_common.dart' diff --git a/pkg/front_end/test/lint_test.status b/pkg/front_end/test/lint_test.status index a5eaf529dd7..581db5fa3c8 100644 --- a/pkg/front_end/test/lint_test.status +++ b/pkg/front_end/test/lint_test.status @@ -14,7 +14,8 @@ front_end/lib/src/api_prototype/static_weak_references/Exports: Fail front_end/lib/src/api_prototype/terminal_color_support/Exports: Fail front_end/lib/src/api_prototype/try_constant_evaluator/Exports: Fail front_end/lib/src/api_unstable/bazel_worker/Exports: Fail -front_end/lib/src/fasta/codes/fasta_codes/Exports: Fail +front_end/lib/src/api_unstable/vm/Exports: Fail +front_end/lib/src/codes/cfe_codes/Exports: Fail front_end/lib/src/fasta/messages/Exports: Fail front_end/lib/src/testing/id_testing_helper/Exports: Fail kernel/lib/ast/Exports: Fail diff --git a/pkg/front_end/test/messages_json_test.dart b/pkg/front_end/test/messages_json_test.dart index 52340f823f0..e85d0e30ac0 100644 --- a/pkg/front_end/test/messages_json_test.dart +++ b/pkg/front_end/test/messages_json_test.dart @@ -5,7 +5,7 @@ import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart' show DiagnosticMessage, getMessageUri; import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show Code, DiagnosticMessageFromJson, diff --git a/pkg/front_end/test/parser_test_parser.dart b/pkg/front_end/test/parser_test_parser.dart index 1bbc88e648f..37f208a2e93 100644 --- a/pkg/front_end/test/parser_test_parser.dart +++ b/pkg/front_end/test/parser_test_parser.dart @@ -19,7 +19,7 @@ import 'package:_fe_analyzer_shared/src/parser/parser_impl.dart' import 'package:_fe_analyzer_shared/src/parser/token_stream_rewriter.dart'; import 'package:_fe_analyzer_shared/src/parser/type_info.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' as codes; +import 'package:front_end/src/codes/cfe_codes.dart' as codes; import 'package:front_end/src/fasta/source/diet_parser.dart' show useImplicitCreationExpressionInCfe; diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart index 394ab688105..ea227be3512 100644 --- a/pkg/front_end/test/parser_test_parser_creator.dart +++ b/pkg/front_end/test/parser_test_parser_creator.dart @@ -55,7 +55,7 @@ import 'package:_fe_analyzer_shared/src/parser/parser_impl.dart' show AwaitOrYie import 'package:_fe_analyzer_shared/src/parser/token_stream_rewriter.dart'; import 'package:_fe_analyzer_shared/src/parser/type_info.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' as codes; +import 'package:front_end/src/codes/cfe_codes.dart' as codes; import 'package:front_end/src/fasta/source/diet_parser.dart' show useImplicitCreationExpressionInCfe; diff --git a/pkg/front_end/test/scanner_fasta_test.dart b/pkg/front_end/test/scanner_fasta_test.dart index cc150f8409e..12afe4e332a 100644 --- a/pkg/front_end/test/scanner_fasta_test.dart +++ b/pkg/front_end/test/scanner_fasta_test.dart @@ -13,7 +13,7 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart'; import 'package:_fe_analyzer_shared/src/scanner/token.dart' as fasta; import 'package:_fe_analyzer_shared/src/scanner/token.dart'; import 'package:_fe_analyzer_shared/src/scanner/token_constants.dart' as fasta; -import 'package:front_end/src/fasta/codes/fasta_codes.dart'; +import 'package:front_end/src/codes/cfe_codes.dart'; 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 406d36620fd..8ac11de02f9 100644 --- a/pkg/front_end/test/src/base/processed_options_test.dart +++ b/pkg/front_end/test/src/base/processed_options_test.dart @@ -7,7 +7,7 @@ import 'dart:convert' show jsonEncode; 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/codes/fasta_codes.dart'; +import 'package:front_end/src/codes/cfe_codes.dart'; import 'package:front_end/src/fasta/compiler_context.dart'; import 'package:front_end/src/fasta/util/bytes_sink.dart' show BytesSink; import 'package:kernel/binary/ast_to_binary.dart' show BinaryPrinter; diff --git a/pkg/front_end/test/type_labeler_test.dart b/pkg/front_end/test/type_labeler_test.dart index a0c4f27441d..dfcda02eba4 100644 --- a/pkg/front_end/test/type_labeler_test.dart +++ b/pkg/front_end/test/type_labeler_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:expect/expect.dart'; -import 'package:front_end/src/fasta/codes/type_labeler.dart'; +import 'package:front_end/src/codes/type_labeler.dart'; import 'package:kernel/ast.dart'; void main() { diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json index 77cab3dc601..f478b6a16e0 100644 --- a/pkg/front_end/testing.json +++ b/pkg/front_end/testing.json @@ -273,7 +273,7 @@ "exclude": [ "kernel/lib/transformations/.*\\.dart$", "_fe_analyzer_shared/lib/src/messages/codes_generated\\.dart$", - "front_end/lib/src/fasta/codes/fasta_codes_cfe_generated\\.dart$" + "front_end/lib/src/codes/cfe_codes_generated\\.dart$" ] }, { @@ -310,7 +310,7 @@ ], "exclude": [ "_fe_analyzer_shared/lib/src/messages/codes_generated\\.dart$", - "front_end/lib/src/fasta/codes/fasta_codes_cfe_generated\\.dart$" + "front_end/lib/src/codes/cfe_codes_generated\\.dart$" ] }, { diff --git a/pkg/front_end/tool/_fasta/additional_targets_test.dart b/pkg/front_end/tool/_fasta/additional_targets_test.dart index cafa3b4ff09..85d15bc38f9 100644 --- a/pkg/front_end/tool/_fasta/additional_targets_test.dart +++ b/pkg/front_end/tool/_fasta/additional_targets_test.dart @@ -5,7 +5,7 @@ library fasta.tool.additional_targets_test; import 'package:front_end/src/base/command_line_options.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show MessageCode, messageFastaUsageLong; import 'package:kernel/target/targets.dart' show targets; diff --git a/pkg/front_end/tool/_fasta/command_line.dart b/pkg/front_end/tool/_fasta/command_line.dart index 0c3d06f834f..e01c3e0fb32 100644 --- a/pkg/front_end/tool/_fasta/command_line.dart +++ b/pkg/front_end/tool/_fasta/command_line.dart @@ -25,7 +25,7 @@ import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; import 'package:front_end/src/compute_platform_binaries_location.dart' show computePlatformBinariesLocation, computePlatformDillName; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show Message, PlainAndColorizedString, diff --git a/pkg/front_end/tool/_fasta/entry_points.dart b/pkg/front_end/tool/_fasta/entry_points.dart index 6a8f2b5bd20..3e19ab2e8b9 100644 --- a/pkg/front_end/tool/_fasta/entry_points.dart +++ b/pkg/front_end/tool/_fasta/entry_points.dart @@ -17,7 +17,7 @@ import 'package:front_end/src/api_prototype/kernel_generator.dart'; import 'package:front_end/src/base/command_line_options.dart'; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show codeInternalProblemVerificationError; import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext; import 'package:front_end/src/fasta/get_dependencies.dart' show getDependencies; diff --git a/pkg/front_end/tool/_fasta/generate_messages_lib.dart b/pkg/front_end/tool/_fasta/generate_messages_lib.dart index 55280560342..794fce5ba5a 100644 --- a/pkg/front_end/tool/_fasta/generate_messages_lib.dart +++ b/pkg/front_end/tool/_fasta/generate_messages_lib.dart @@ -14,8 +14,8 @@ Uri computeSharedGeneratedFile(Uri repoDir) { } Uri computeCfeGeneratedFile(Uri repoDir) { - return repoDir.resolve( - "pkg/front_end/lib/src/fasta/codes/fasta_codes_cfe_generated.dart"); + return repoDir + .resolve("pkg/front_end/lib/src/codes/cfe_codes_generated.dart"); } class Messages { @@ -62,7 +62,7 @@ part of _fe_analyzer_shared.messages.codes; """); cfeMessages.writeln(preamble2); cfeMessages.writeln(""" -part of fasta.codes; +part of 'cfe_codes.dart'; """); bool hasError = false; diff --git a/pkg/front_end/tool/dart_doctest_impl.dart b/pkg/front_end/tool/dart_doctest_impl.dart index 8663c635a30..47b9b44c1fc 100644 --- a/pkg/front_end/tool/dart_doctest_impl.dart +++ b/pkg/front_end/tool/dart_doctest_impl.dart @@ -26,7 +26,7 @@ import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/api_prototype/standard_file_system.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/builder/library_builder.dart'; -import 'package:front_end/src/fasta/codes/fasta_codes.dart'; +import 'package:front_end/src/codes/cfe_codes.dart'; import 'package:front_end/src/fasta/combinator.dart'; import 'package:front_end/src/fasta/command_line_reporting.dart' as command_line_reporting; diff --git a/pkg/front_end/tool/perf_common.dart b/pkg/front_end/tool/perf_common.dart index a32002c5dd3..a00473230a0 100644 --- a/pkg/front_end/tool/perf_common.dart +++ b/pkg/front_end/tool/perf_common.dart @@ -12,7 +12,7 @@ import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart' import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity; import 'package:front_end/src/api_prototype/terminal_color_support.dart' show printDiagnosticMessage; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' as fastaCodes; +import 'package:front_end/src/codes/cfe_codes.dart' as fastaCodes; import 'package:kernel/target/targets.dart' show Target, TargetFlags; import 'package:vm/modular/target/flutter.dart' show FlutterTarget; import 'package:vm/modular/target/vm.dart' show VmTarget; diff --git a/pkg/kernel/problems.md b/pkg/kernel/problems.md index bf9c4098451..a6448c1d396 100644 --- a/pkg/kernel/problems.md +++ b/pkg/kernel/problems.md @@ -27,4 +27,4 @@ Normally this is null. These values are subject to change, but this file will be updated along with any such changes. On the code-side these are defined in -`package:front_end/src/fasta/codes/fasta_codes.dart`. +`package:front_end/src/codes/cfe_codes.dart`. diff --git a/pkg/vm/lib/modular/transformations/deeply_immutable.dart b/pkg/vm/lib/modular/transformations/deeply_immutable.dart index 8a4c408732d..2110465f330 100644 --- a/pkg/vm/lib/modular/transformations/deeply_immutable.dart +++ b/pkg/vm/lib/modular/transformations/deeply_immutable.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/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show messageFfiDeeplyImmutableClassesMustBeFinalOrSealed, messageFfiDeeplyImmutableFieldsModifiers, diff --git a/pkg/vm/lib/modular/transformations/ffi/common.dart b/pkg/vm/lib/modular/transformations/ffi/common.dart index c004028b09f..708ce37f23a 100644 --- a/pkg/vm/lib/modular/transformations/ffi/common.dart +++ b/pkg/vm/lib/modular/transformations/ffi/common.dart @@ -7,7 +7,7 @@ library vm.transformations.ffi; -import 'package:front_end/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show messageFfiLeafCallMustNotReturnHandle, messageFfiLeafCallMustNotTakeHandle, diff --git a/pkg/vm/lib/modular/transformations/ffi/definitions.dart b/pkg/vm/lib/modular/transformations/ffi/definitions.dart index fc59301d5c1..e710e705158 100644 --- a/pkg/vm/lib/modular/transformations/ffi/definitions.dart +++ b/pkg/vm/lib/modular/transformations/ffi/definitions.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/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show messageFfiAbiSpecificIntegerInvalid, messageFfiAbiSpecificIntegerMappingInvalid, diff --git a/pkg/vm/lib/modular/transformations/ffi/native.dart b/pkg/vm/lib/modular/transformations/ffi/native.dart index 866178e021e..68a53ff9571 100644 --- a/pkg/vm/lib/modular/transformations/ffi/native.dart +++ b/pkg/vm/lib/modular/transformations/ffi/native.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/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show messageFfiDefaultAssetDuplicate, messageFfiNativeDuplicateAnnotations, diff --git a/pkg/vm/lib/modular/transformations/ffi/use_sites.dart b/pkg/vm/lib/modular/transformations/ffi/use_sites.dart index 3daff1832a6..a1b1fe4b0b4 100644 --- a/pkg/vm/lib/modular/transformations/ffi/use_sites.dart +++ b/pkg/vm/lib/modular/transformations/ffi/use_sites.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/src/fasta/codes/fasta_codes.dart' +import 'package:front_end/src/codes/cfe_codes.dart' show messageFfiAddressOfMustBeNative, messageFfiAddressPosition,