Skip to content

Commit 808fa4c

Browse files
johnniwintherCommit Queue
authored andcommitted
[cfe] Move tool/_fasta/ to tool/
Change-Id: I5b7348fb4adb4e7f4039c91d54d712c1eb131ecf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/395002 Reviewed-by: Jens Johansen <[email protected]> Reviewed-by: Slava Egorov <[email protected]> Commit-Queue: Johnni Winther <[email protected]>
1 parent 73adec7 commit 808fa4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+79
-90
lines changed

build/rbe/rewrapper_dart.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ def parse_dart(self):
320320
elif arg == 'gen/utils/analysis_server/analysis_server.dart.dill':
321321
self.extra_paths.add(self.rebase(arg))
322322
return self.parse_analysis_server()
323-
elif arg == '../../pkg/front_end/tool/_fasta/compile_platform.dart':
323+
elif arg == '../../pkg/front_end/tool/compile_platform.dart':
324324
self.entry_points.add(self.rebase(arg))
325325
return self.parse_compile_platform()
326326
elif arg == '../../utils/compiler/create_snapshot_entry.dart':

pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void main() async {
7676
var pkgDirectory =
7777
path.dirname(path.dirname(path.dirname(path.dirname(scriptDirectory))));
7878
var compilePath = path.canonicalize(
79-
path.join(pkgDirectory, "front_end", "tool", "_fasta", "compile.dart"));
79+
path.join(pkgDirectory, "front_end", "tool", "compile.dart"));
8080
var testClassesPath =
8181
path.canonicalize(path.join(scriptDirectory, "test_classes.dart"));
8282
var ddcOutlinePath = path.canonicalize(path.join(

pkg/front_end/lib/src/base/processed_options.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -615,13 +615,6 @@ class ProcessedOptions {
615615

616616
Future<TargetLibrariesSpecification> _computeLibrarySpecification() async {
617617
String name = target.name;
618-
// TODO(sigmund): Eek! We should get to the point where there is no
619-
// fasta-specific targets and the target names are meaningful.
620-
if (name.endsWith('_fasta')) {
621-
// Coverage-ignore-block(suite): Not run.
622-
name = name.substring(0, name.length - 6);
623-
}
624-
625618
if (librariesSpecificationUri == null ||
626619
!await fileSystem.entityForUri(librariesSpecificationUri!).exists()) {
627620
if (compileSdk) {

pkg/front_end/lib/src/testing/analysis_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ class ClassLookup {
287287
// TODO(johnniwinther): Update this to include all files in the cfe, and not
288288
// only those reachable from 'compiler.dart'.
289289
final List<Uri> cfeOnlyEntryPoints = [
290-
Uri.base.resolve('pkg/front_end/tool/_fasta/compile.dart')
290+
Uri.base.resolve('pkg/front_end/tool/compile.dart')
291291
];
292292

293293
/// Filter function used to only analyze cfe source code.
@@ -309,7 +309,7 @@ bool cfeOnly(Uri uri) {
309309
// TODO(johnniwinther): Update this to include all files in cfe and backends,
310310
// and not only those reachable from these entry points.
311311
List<Uri> cfeAndBackendsEntryPoints = [
312-
Uri.base.resolve('pkg/front_end/tool/_fasta/compile.dart'),
312+
Uri.base.resolve('pkg/front_end/tool/compile.dart'),
313313
Uri.base.resolve('pkg/vm/lib/kernel_front_end.dart'),
314314
Uri.base.resolve('pkg/compiler/lib/src/dart2js.dart'),
315315
Uri.base.resolve('pkg/dev_compiler/bin/dartdevc.dart'),

pkg/front_end/lib/src/util/parser_ast_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import '../base/messages.dart';
1919
// ignore_for_file: lines_longer_than_80_chars
2020

2121
// THIS FILE IS AUTO GENERATED BY
22-
// 'tool/_fasta/parser_ast_helper_creator.dart'
22+
// 'tool/parser_ast_helper_creator.dart'
2323
// Run this command to update it:
24-
// 'dart pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart'
24+
// 'dart pkg/front_end/tool/parser_ast_helper_creator.dart'
2525

2626
abstract class ParserAstNode {
2727
final String what;

pkg/front_end/messages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Run
66
#
7-
# dart run pkg/front_end/tool/_fasta/generate_messages.dart
7+
# dart run pkg/front_end/tool/generate_messages.dart
88
#
99
# to regenerate messages after having edited this file.
1010
#

pkg/front_end/presubmit_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ const Set<String> _generatedFilesUpToDateFiles = {
8686
"pkg/front_end/test/parser_test_listener.dart",
8787
"pkg/front_end/test/parser_test_parser_creator.dart",
8888
"pkg/front_end/test/parser_test_parser.dart",
89-
"pkg/front_end/tool/_fasta/generate_messages.dart",
90-
"pkg/front_end/tool/_fasta/parser_ast_helper_creator.dart",
89+
"pkg/front_end/tool/generate_messages.dart",
90+
"pkg/front_end/tool/parser_ast_helper_creator.dart",
9191
"pkg/front_end/tool/generate_ast_coverage.dart",
9292
"pkg/front_end/tool/generate_ast_equivalence.dart",
9393
"pkg/front_end/tool/visitor_generator.dart",

pkg/front_end/presubmit_helper_spawn.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Then run that file through your debugger or similar.
8888
const ["-DfastOnly=true"],
8989
messages_suite.createContext,
9090
me: work.repoDir
91-
.resolve("pkg/front_end/test/fasta/messages_suite.dart"),
92-
configurationPath: "../../testing.json",
91+
.resolve("pkg/front_end/test/messages_suite.dart"),
92+
configurationPath: "../testing.json",
9393
logger: logger,
9494
);
9595
return !logger.gotFailure;

pkg/front_end/test/ast_nodes_has_to_string_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Future<void> main(List<String> args) async {
2222
Class primitiveConstantClass;
2323

2424
{
25-
Uri input = Platform.script.resolve("../tool/_fasta/compile.dart");
25+
Uri input = Platform.script.resolve("../tool/compile.dart");
2626
CompilerOptions options = helper.getOptions();
2727
helper.TestIncrementalCompiler compiler =
2828
new helper.TestIncrementalCompiler(options, input,

pkg/front_end/test/bootstrap_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import 'package:testing/testing.dart' show StdioProcess;
1515
Future main() async {
1616
asyncStart();
1717
Uri sourceCompiler =
18-
Uri.base.resolve("pkg/front_end/tool/_fasta/compile.dart");
19-
Uri outline = Uri.base.resolve("pkg/front_end/tool/_fasta/outline.dart");
18+
Uri.base.resolve("pkg/front_end/tool/compile.dart");
19+
Uri outline = Uri.base.resolve("pkg/front_end/tool/outline.dart");
2020
Directory tmp = await Directory.systemTemp.createTemp("fasta_bootstrap");
2121
Uri compiledOnceOutput = tmp.uri.resolve("fasta1.dill");
2222
Uri compiledTwiceOutput = tmp.uri.resolve("fasta2.dill");

0 commit comments

Comments
 (0)