Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1974)

Unified Diff: tools/testing/dart/compiler_configuration.dart

Issue 2827793002: Format all files under tools and utils directory. (Closed)
Patch Set: Format all files under tools and utils directory. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/testing/dart/co19_test.dart ('k') | tools/testing/dart/http_server.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/compiler_configuration.dart
diff --git a/tools/testing/dart/compiler_configuration.dart b/tools/testing/dart/compiler_configuration.dart
index 1a69df124bc6acf7712b4fa44cb3c59262249387..9ff2e1aeea7769825ad49e8e245d73b418fbeaa4 100644
--- a/tools/testing/dart/compiler_configuration.dart
+++ b/tools/testing/dart/compiler_configuration.dart
@@ -103,13 +103,13 @@ abstract class CompilerConfiguration {
isAndroid: configuration['system'] == 'android');
case 'dartk':
return new NoneCompilerConfiguration(
- isDebug: isDebug,
- isChecked: isChecked,
- isHostChecked: isHostChecked,
- useSdk: useSdk,
- hotReload: hotReload,
- hotReloadRollback: hotReloadRollback,
- useDFE: true);
+ isDebug: isDebug,
+ isChecked: isChecked,
+ isHostChecked: isHostChecked,
+ useSdk: useSdk,
+ hotReload: hotReload,
+ hotReloadRollback: hotReloadRollback,
+ useDFE: true);
case 'dartkp':
return new PrecompilerCompilerConfiguration(
isDebug: isDebug,
@@ -191,10 +191,13 @@ class NoneCompilerConfiguration extends CompilerConfiguration {
final bool useDFE;
NoneCompilerConfiguration(
- {bool isDebug, bool isChecked, bool isHostChecked, bool useSdk,
- bool this.hotReload,
- bool this.hotReloadRollback,
- this.useDFE: false})
+ {bool isDebug,
+ bool isChecked,
+ bool isHostChecked,
+ bool useSdk,
+ bool this.hotReload,
+ bool this.hotReloadRollback,
+ this.useDFE: false})
: super._subclass(
isDebug: isDebug,
isChecked: isChecked,
@@ -235,10 +238,15 @@ class NoneCompilerConfiguration extends CompilerConfiguration {
class DartKCompilerConfiguration extends CompilerConfiguration {
final bool verify, strong, treeShake;
- DartKCompilerConfiguration({bool isChecked, bool isHostChecked, bool useSdk,
- this.verify, this.strong, this.treeShake})
- : super._subclass(isChecked: isChecked, isHostChecked: isHostChecked,
- useSdk: useSdk);
+ DartKCompilerConfiguration(
+ {bool isChecked,
+ bool isHostChecked,
+ bool useSdk,
+ this.verify,
+ this.strong,
+ this.treeShake})
+ : super._subclass(
+ isChecked: isChecked, isHostChecked: isHostChecked, useSdk: useSdk);
@override
String computeCompilerPath(String buildDir) {
@@ -298,8 +306,8 @@ class DartKCompilerConfiguration extends CompilerConfiguration {
args.add('--enable_type_checks');
}
- var newOriginalArguments = replaceDartFileWith(
- originalArguments, artifact.filename);
+ var newOriginalArguments =
+ replaceDartFileWith(originalArguments, artifact.filename);
return args
..addAll(vmOptions)
@@ -309,8 +317,7 @@ class DartKCompilerConfiguration extends CompilerConfiguration {
}
typedef List<String> CompilerArgumentsFunction(
- List<String> globalArguments,
- String previousCompilerOutput);
+ List<String> globalArguments, String previousCompilerOutput);
class PipelineCommand {
final CompilerConfiguration compilerConfiguration;
@@ -319,20 +326,20 @@ class PipelineCommand {
PipelineCommand._(this.compilerConfiguration, this._argumentsFunction);
factory PipelineCommand.runWithGlobalArguments(CompilerConfiguration conf) {
- return new PipelineCommand._(conf, (List<String> globalArguments,
- String previousOutput) {
+ return new PipelineCommand._(conf,
+ (List<String> globalArguments, String previousOutput) {
assert(previousOutput == null);
return globalArguments;
});
}
factory PipelineCommand.runWithDartOrKernelFile(CompilerConfiguration conf) {
- return new PipelineCommand._(conf, (List<String> globalArguments,
- String previousOutput) {
+ return new PipelineCommand._(conf,
+ (List<String> globalArguments, String previousOutput) {
var filtered = globalArguments
- .where((String name) => name.endsWith('.dart') ||
- name.endsWith('.dill'))
- .toList();
+ .where(
+ (String name) => name.endsWith('.dart') || name.endsWith('.dill'))
+ .toList();
assert(filtered.length == 1);
return filtered;
});
@@ -340,15 +347,15 @@ class PipelineCommand {
factory PipelineCommand.runWithPreviousKernelOutput(
CompilerConfiguration conf) {
- return new PipelineCommand._(conf, (List<String> globalArguments,
- String previousOutput) {
+ return new PipelineCommand._(conf,
+ (List<String> globalArguments, String previousOutput) {
assert(previousOutput.endsWith('.dill'));
return replaceDartFileWith(globalArguments, previousOutput);
});
}
- List<String> extractArguments(List<String> globalArguments,
- String previousOutput) {
+ List<String> extractArguments(
+ List<String> globalArguments, String previousOutput) {
return _argumentsFunction(globalArguments, previousOutput);
}
}
@@ -364,14 +371,14 @@ class ComposedCompilerConfiguration extends CompilerConfiguration {
CommandBuilder commandBuilder,
List globalArguments,
Map<String, String> environmentOverrides) {
-
List<Command> allCommands = [];
// The first compilation command is as usual.
var arguments = pipelineCommands[0].extractArguments(globalArguments, null);
- CommandArtifact artifact =
- pipelineCommands[0].compilerConfiguration.computeCompilationArtifact(
- buildDir, tempDir, commandBuilder, arguments, environmentOverrides);
+ CommandArtifact artifact = pipelineCommands[0]
+ .compilerConfiguration
+ .computeCompilationArtifact(
+ buildDir, tempDir, commandBuilder, arguments, environmentOverrides);
allCommands.addAll(artifact.commands);
// The following compilation commands are based on the output of the
@@ -407,40 +414,66 @@ class ComposedCompilerConfiguration extends CompilerConfiguration {
CompilerConfiguration lastCompilerConfiguration =
pipelineCommands.last.compilerConfiguration;
return lastCompilerConfiguration.computeRuntimeArguments(
- runtimeConfiguration, buildDir, info, vmOptions, sharedOptions,
- originalArguments, artifact);
+ runtimeConfiguration,
+ buildDir,
+ info,
+ vmOptions,
+ sharedOptions,
+ originalArguments,
+ artifact);
}
static ComposedCompilerConfiguration createDartKPConfiguration(
- {bool isChecked, bool isHostChecked, String arch, bool useBlobs,
- bool isAndroid, bool useSdk, bool verify, bool strong, bool treeShake}) {
+ {bool isChecked,
+ bool isHostChecked,
+ String arch,
+ bool useBlobs,
+ bool isAndroid,
+ bool useSdk,
+ bool verify,
+ bool strong,
+ bool treeShake}) {
var nested = [];
// Compile with dartk.
nested.add(new PipelineCommand.runWithGlobalArguments(
- new DartKCompilerConfiguration(isChecked: isChecked,
- isHostChecked: isHostChecked, useSdk: useSdk, verify: verify,
- strong: strong, treeShake: treeShake)));
+ new DartKCompilerConfiguration(
+ isChecked: isChecked,
+ isHostChecked: isHostChecked,
+ useSdk: useSdk,
+ verify: verify,
+ strong: strong,
+ treeShake: treeShake)));
// Run the normal precompiler.
nested.add(new PipelineCommand.runWithPreviousKernelOutput(
new PrecompilerCompilerConfiguration(
- isChecked: isChecked, arch: arch, useBlobs: useBlobs,
- isAndroid: isAndroid)));
+ isChecked: isChecked,
+ arch: arch,
+ useBlobs: useBlobs,
+ isAndroid: isAndroid)));
return new ComposedCompilerConfiguration(nested);
}
static ComposedCompilerConfiguration createDartKConfiguration(
- {bool isChecked, bool isHostChecked, bool useSdk, bool verify,
- bool strong, bool treeShake}) {
+ {bool isChecked,
+ bool isHostChecked,
+ bool useSdk,
+ bool verify,
+ bool strong,
+ bool treeShake}) {
var nested = [];
// Compile with dartk.
nested.add(new PipelineCommand.runWithGlobalArguments(
- new DartKCompilerConfiguration(isChecked: isChecked,
- isHostChecked: isHostChecked, useSdk: useSdk,
- verify: verify, strong: strong, treeShake: treeShake)));
+ new DartKCompilerConfiguration(
+ isChecked: isChecked,
+ isHostChecked: isHostChecked,
+ useSdk: useSdk,
+ verify: verify,
+ strong: strong,
+ treeShake: treeShake)));
return new ComposedCompilerConfiguration(nested);
}
@@ -580,8 +613,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
final bool isAndroid;
final bool useDFE;
- PrecompilerCompilerConfiguration({bool isDebug, bool isChecked,
- this.arch, this.useBlobs, this.isAndroid, this.useDFE: false})
+ PrecompilerCompilerConfiguration(
+ {bool isDebug,
+ bool isChecked,
+ this.arch,
+ this.useBlobs,
+ this.isAndroid,
+ this.useDFE: false})
: super._subclass(isDebug: isDebug, isChecked: isChecked);
int computeTimeoutMultiplier() {
@@ -598,15 +636,16 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
List arguments,
Map<String, String> environmentOverrides) {
var commands = new List<Command>();
- commands.add(this.computeCompilationCommand(tempDir, buildDir, CommandBuilder.instance,
- arguments, environmentOverrides));
+ commands.add(this.computeCompilationCommand(tempDir, buildDir,
+ CommandBuilder.instance, arguments, environmentOverrides));
if (!useBlobs) {
- commands.add(this.computeAssembleCommand(tempDir, buildDir, CommandBuilder.instance,
- arguments, environmentOverrides));
+ commands.add(this.computeAssembleCommand(tempDir, buildDir,
+ CommandBuilder.instance, arguments, environmentOverrides));
commands.add(this.computeRemoveAssemblyCommand(tempDir, buildDir,
CommandBuilder.instance, arguments, environmentOverrides));
}
- return new CommandArtifact(commands, '$tempDir', 'application/dart-precompiled');
+ return new CommandArtifact(
+ commands, '$tempDir', 'application/dart-precompiled');
}
CompilationCommand computeCompilationCommand(
@@ -651,7 +690,6 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
CommandBuilder commandBuilder,
List arguments,
Map<String, String> environmentOverrides) {
-
var cc, shared, ld_flags;
if (isAndroid) {
var ndk = "third_party/android_tools/ndk";
@@ -779,8 +817,8 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration {
// directory on the device, use that one instead.
dir = DartPrecompiledAdbRuntimeConfiguration.DeviceTestDir;
}
- originalArguments = replaceDartFileWith(
- originalArguments, "$dir/out.aotsnapshot");
+ originalArguments =
+ replaceDartFileWith(originalArguments, "$dir/out.aotsnapshot");
return args
..addAll(vmOptions)
@@ -808,8 +846,8 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
Map<String, String> environmentOverrides) {
var snapshot = "$tempDir/out.jitsnapshot";
return new CommandArtifact(<Command>[
- this.computeCompilationCommand(tempDir, buildDir,
- CommandBuilder.instance, arguments, environmentOverrides)
+ this.computeCompilationCommand(tempDir, buildDir, CommandBuilder.instance,
+ arguments, environmentOverrides)
], snapshot, 'application/dart-snapshot');
}
@@ -826,14 +864,8 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
args.add("--snapshot-kind=app-jit");
args.addAll(arguments);
- return commandBuilder.getCompilationCommand(
- 'app_jit',
- tempDir,
- !useSdk,
- bootstrapDependencies(buildDir),
- exec,
- args,
- environmentOverrides);
+ return commandBuilder.getCompilationCommand('app_jit', tempDir, !useSdk,
+ bootstrapDependencies(buildDir), exec, args, environmentOverrides);
}
List<String> computeCompilerArguments(
@@ -862,10 +894,7 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
args.add('--enable_asserts');
args.add('--enable_type_checks');
}
- args
- ..addAll(vmOptions)
- ..addAll(sharedOptions)
- ..addAll(originalArguments);
+ args..addAll(vmOptions)..addAll(sharedOptions)..addAll(originalArguments);
for (var i = 0; i < args.length; i++) {
if (args[i].endsWith(".dart")) {
args[i] = artifact.filename;
@@ -877,8 +906,11 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
class AnalyzerCompilerConfiguration extends CompilerConfiguration {
AnalyzerCompilerConfiguration(
- {bool isDebug, bool isChecked, bool isStrong, bool isHostChecked, bool
- useSdk})
+ {bool isDebug,
+ bool isChecked,
+ bool isStrong,
+ bool isHostChecked,
+ bool useSdk})
: super._subclass(
isDebug: isDebug,
isChecked: isChecked,
@@ -918,7 +950,7 @@ class AnalyzerCompilerConfiguration extends CompilerConfiguration {
if (isChecked || isStrong) {
arguments.add('--enable_type_checks');
}
- if (isStrong){
+ if (isStrong) {
arguments.add('--strong');
}
return new CommandArtifact(<Command>[
« no previous file with comments | « tools/testing/dart/co19_test.dart ('k') | tools/testing/dart/http_server.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698