Skip to content

Commit 77d80f4

Browse files
authored
[native_toolchain_c] Apply dot shorthands (dart-lang#3165)
1 parent b2ec0d5 commit 77d80f4

15 files changed

Lines changed: 139 additions & 161 deletions

‎pkgs/native_toolchain_c/lib/src/cbuilder/cbuilder.dart‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import 'package:meta/meta.dart';
1111

1212
import 'build_mode.dart';
1313
import 'ctool.dart';
14-
import 'language.dart';
1514
import 'linkmode.dart';
1615
import 'logger.dart';
17-
import 'optimization_level.dart';
1816
import 'output_type.dart';
1917
import 'run_cbuilder.dart';
2018

@@ -74,11 +72,11 @@ class CBuilder extends CTool implements Builder {
7472
this.ndebugDefine = true,
7573
super.pic = true,
7674
super.std,
77-
super.language = Language.c,
75+
super.language = .c,
7876
super.cppLinkStdLib,
7977
super.linkModePreference,
80-
super.optimizationLevel = OptimizationLevel.o3,
81-
this.buildMode = BuildMode.release,
78+
super.optimizationLevel = .o3,
79+
this.buildMode = .release,
8280
}) : super(type: OutputType.library);
8381

8482
CBuilder.executable({
@@ -101,10 +99,10 @@ class CBuilder extends CTool implements Builder {
10199
this.ndebugDefine = true,
102100
bool? pie = false,
103101
super.std,
104-
super.language = Language.c,
102+
super.language = .c,
105103
super.cppLinkStdLib,
106-
super.optimizationLevel = OptimizationLevel.o3,
107-
this.buildMode = BuildMode.release,
104+
super.optimizationLevel = .o3,
105+
this.buildMode = .release,
108106
}) : super(
109107
type: OutputType.executable,
110108
assetName: null,
@@ -196,7 +194,7 @@ class CBuilder extends CTool implements Builder {
196194
defines: {
197195
...defines,
198196
if (buildModeDefine) buildMode.name.toUpperCase(): null,
199-
if (ndebugDefine && buildMode != BuildMode.debug) 'NDEBUG': null,
197+
if (ndebugDefine && buildMode != .debug) 'NDEBUG': null,
200198
},
201199
pic: pic,
202200
std: std,

‎pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ import 'package:logging/logging.dart';
1010
import 'package:meta/meta.dart';
1111

1212
import 'ctool.dart';
13-
import 'language.dart';
1413
import 'linker_options.dart';
1514
import 'linkmode.dart';
16-
import 'optimization_level.dart';
1715
import 'output_type.dart';
1816
import 'run_cbuilder.dart';
1917

@@ -37,10 +35,10 @@ class CLinker extends CTool implements Linker {
3735
super.defines = const {},
3836
super.pic = true,
3937
super.std,
40-
super.language = Language.c,
38+
super.language = .c,
4139
super.cppLinkStdLib,
4240
super.linkModePreference,
43-
super.optimizationLevel = OptimizationLevel.o3,
41+
super.optimizationLevel = .o3,
4442
}) : super(type: OutputType.library);
4543

4644
/// Runs the C Linker with on this C build spec.

‎pkgs/native_toolchain_c/lib/src/cbuilder/compiler_resolver.dart‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class CompilerResolver {
3333
required this.logger,
3434
OS? hostOS, // Only visible for testing.
3535
Architecture? hostArchitecture, // Only visible for testing.
36-
}) : hostOS = hostOS ?? OS.current,
37-
hostArchitecture = hostArchitecture ?? Architecture.current,
36+
}) : hostOS = hostOS ?? .current,
37+
hostArchitecture = hostArchitecture ?? .current,
3838
context = ToolResolvingContext(logger: logger);
3939

4040
Future<ToolInstance> resolveCompiler() async {
@@ -65,28 +65,28 @@ class CompilerResolver {
6565
final targetArch = codeConfig.targetArchitecture;
6666

6767
switch ((hostOS, targetOS, targetArch)) {
68-
case (_, OS.android, _):
68+
case (_, .android, _):
6969
yield androidNdkClang;
70-
case (OS.macOS, OS.macOS || OS.iOS, _):
70+
case (.macOS, .macOS || .iOS, _):
7171
yield appleClang;
7272
yield clang;
73-
case (OS.linux, OS.linux, _) when hostArchitecture == targetArch:
73+
case (.linux, .linux, _) when hostArchitecture == targetArch:
7474
yield clang;
75-
case (OS.linux, _, Architecture.arm):
75+
case (.linux, _, .arm):
7676
yield armLinuxGnueabihfGcc;
77-
case (OS.linux, _, Architecture.arm64):
77+
case (.linux, _, .arm64):
7878
yield aarch64LinuxGnuGcc;
79-
case (OS.linux, _, Architecture.ia32):
79+
case (.linux, _, .ia32):
8080
yield i686LinuxGnuGcc;
81-
case (OS.linux, _, Architecture.x64):
81+
case (.linux, _, .x64):
8282
yield x86_64LinuxGnuGcc;
83-
case (OS.linux, _, Architecture.riscv64):
83+
case (.linux, _, .riscv64):
8484
yield riscv64LinuxGnuGcc;
85-
case (OS.windows, _, Architecture.ia32):
85+
case (.windows, _, .ia32):
8686
yield clIA32;
87-
case (OS.windows, _, Architecture.arm64):
87+
case (.windows, _, .arm64):
8888
yield clArm64;
89-
case (OS.windows, _, Architecture.x64):
89+
case (.windows, _, .x64):
9090
yield cl;
9191
}
9292
}
@@ -143,32 +143,32 @@ class CompilerResolver {
143143
// TODO(dacoharkes): Support falling back on other tools.
144144
if (targetArchitecture == hostArchitecture &&
145145
targetOS == hostOS &&
146-
hostOS == OS.linux) {
146+
hostOS == .linux) {
147147
return llvmAr;
148148
}
149-
if (targetOS == OS.macOS || targetOS == OS.iOS) return appleAr;
150-
if (targetOS == OS.android) return androidNdkLlvmAr;
151-
if (hostOS == OS.linux) {
149+
if (targetOS == .macOS || targetOS == .iOS) return appleAr;
150+
if (targetOS == .android) return androidNdkLlvmAr;
151+
if (hostOS == .linux) {
152152
switch (targetArchitecture) {
153-
case Architecture.arm:
153+
case .arm:
154154
return armLinuxGnueabihfGccAr;
155-
case Architecture.arm64:
155+
case .arm64:
156156
return aarch64LinuxGnuGccAr;
157-
case Architecture.ia32:
157+
case .ia32:
158158
return i686LinuxGnuGccAr;
159-
case Architecture.x64:
159+
case .x64:
160160
return x86_64LinuxGnuGccAr;
161-
case Architecture.riscv64:
161+
case .riscv64:
162162
return riscv64LinuxGnuGccAr;
163163
}
164164
}
165-
if (hostOS == OS.windows) {
165+
if (hostOS == .windows) {
166166
switch (targetArchitecture) {
167-
case Architecture.ia32:
167+
case .ia32:
168168
return libIA32;
169-
case Architecture.arm64:
169+
case .arm64:
170170
return libArm64;
171-
case Architecture.x64:
171+
case .x64:
172172
return lib;
173173
}
174174
}
@@ -191,7 +191,7 @@ class CompilerResolver {
191191
}
192192

193193
Future<Map<String, String>> resolveEnvironment(ToolInstance compiler) async {
194-
if (codeConfig.targetOS != OS.windows) {
194+
if (codeConfig.targetOS != .windows) {
195195
return {};
196196
}
197197

‎pkgs/native_toolchain_c/lib/src/cbuilder/linker_options.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extension LinkerOptionsExt on LinkerOptions {
121121
OS targetOS,
122122
) {
123123
switch (targetOS) {
124-
case OS.macOS || OS.iOS:
124+
case .macOS || .iOS:
125125
return [
126126
if (!_keepAllSymbols) ...sourceFiles,
127127
..._toLinkerSyntax(tool, [
@@ -137,7 +137,7 @@ extension LinkerOptionsExt on LinkerOptions {
137137
]),
138138
];
139139

140-
case OS.android || OS.linux:
140+
case .android || .linux:
141141
final wholeArchiveSandwich =
142142
sourceFiles.any((source) => source.endsWith('.a')) ||
143143
_keepAllSymbols;
@@ -173,8 +173,7 @@ extension LinkerOptionsExt on LinkerOptions {
173173
if (_keepAllSymbols) ...sourceFiles.map((e) => '/WHOLEARCHIVE:$e'),
174174
..._linkerFlags,
175175
..._symbols.map(
176-
(symbol) =>
177-
'/INCLUDE:${targetArch == Architecture.ia32 ? '_' : ''}$symbol',
176+
(symbol) => '/INCLUDE:${targetArch == .ia32 ? '_' : ''}$symbol',
178177
),
179178
if (_linkerScriptMode is ManualLinkerScript)
180179
'/DEF:${_linkerScriptMode.script.toFilePath()}'

‎pkgs/native_toolchain_c/lib/src/cbuilder/linkmode.dart‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
import 'package:code_assets/code_assets.dart';
66

77
LinkMode getLinkMode(LinkModePreference preference) {
8-
if (preference == LinkModePreference.dynamic ||
9-
preference == LinkModePreference.preferDynamic) {
8+
if (preference == .dynamic || preference == .preferDynamic) {
109
return DynamicLoadingBundled();
1110
}
12-
assert(
13-
preference == LinkModePreference.static ||
14-
preference == LinkModePreference.preferStatic,
15-
);
11+
assert(preference == .static || preference == .preferStatic);
1612
return StaticLinking();
1713
}

‎pkgs/native_toolchain_c/lib/src/cbuilder/logger.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import 'package:logging/logging.dart';
99
/// Creates a default logger that logs to stdout and stderr.
1010
Logger createDefaultLogger() {
1111
final logger = Logger.detached('CBuilder');
12-
logger.level = Level.INFO;
12+
logger.level = .INFO;
1313
logger.onRecord.listen((record) {
14-
if (record.level >= Level.WARNING) {
14+
if (record.level >= .WARNING) {
1515
stderr.writeln(record.message);
1616
} else {
1717
stdout.writeln(record.message);

‎pkgs/native_toolchain_c/lib/src/cbuilder/run_cbuilder.dart‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ class RunCBuilder {
7171
this.defines = const {},
7272
this.pic,
7373
this.std,
74-
this.language = Language.c,
74+
this.language = .c,
7575
this.cppLinkStdLib,
7676
required this.optimizationLevel,
7777
}) : outDir = input.outputDirectory,
7878
assert(
7979
[executable, dynamicLibrary, staticLibrary].whereType<Uri>().length ==
8080
1,
8181
) {
82-
if (codeConfig.targetOS == OS.windows && cppLinkStdLib != null) {
82+
if (codeConfig.targetOS == .windows && cppLinkStdLib != null) {
8383
throw ArgumentError.value(
8484
cppLinkStdLib,
8585
'cppLinkStdLib',
@@ -98,12 +98,12 @@ class RunCBuilder {
9898
Future<Uri> archiver() async => (await _resolver.resolveArchiver()).uri;
9999

100100
Future<Uri> iosSdk(IOSSdk iosSdk, ToolResolvingContext context) async {
101-
if (iosSdk == IOSSdk.iPhoneOS) {
101+
if (iosSdk == .iPhoneOS) {
102102
return (await iPhoneOSSdk.defaultResolver!.resolve(
103103
context,
104104
)).where((i) => i.tool == iPhoneOSSdk).first.uri;
105105
}
106-
assert(iosSdk == IOSSdk.iPhoneSimulator);
106+
assert(iosSdk == .iPhoneSimulator);
107107
return (await iPhoneSimulatorSdk.defaultResolver!.resolve(
108108
context,
109109
)).where((i) => i.tool == iPhoneSimulatorSdk).first.uri;
@@ -141,7 +141,7 @@ class RunCBuilder {
141141
}
142142

143143
final IOSSdk? targetIosSdk;
144-
if (codeConfig.targetOS == OS.iOS) {
144+
if (codeConfig.targetOS == .iOS) {
145145
targetIosSdk = codeConfig.iOS.targetSdk;
146146
} else {
147147
targetIosSdk = null;
@@ -151,7 +151,7 @@ class RunCBuilder {
151151
// invoking clang. Mimic that behavior here.
152152
// See https://github.com/dart-lang/native/issues/171.
153153
final int? targetAndroidNdkApi;
154-
if (codeConfig.targetOS == OS.android) {
154+
if (codeConfig.targetOS == .android) {
155155
final minimumApi = codeConfig.targetArchitecture == Architecture.riscv64
156156
? 35
157157
: 21;
@@ -160,10 +160,10 @@ class RunCBuilder {
160160
targetAndroidNdkApi = null;
161161
}
162162

163-
final targetIOSVersion = codeConfig.targetOS == OS.iOS
163+
final targetIOSVersion = codeConfig.targetOS == .iOS
164164
? codeConfig.iOS.targetVersion
165165
: null;
166-
final targetMacOSVersion = codeConfig.targetOS == OS.macOS
166+
final targetMacOSVersion = codeConfig.targetOS == .macOS
167167
? codeConfig.macOS.targetVersion
168168
: null;
169169

@@ -231,26 +231,26 @@ class RunCBuilder {
231231
executable: toolInstance.uri,
232232
environment: environment,
233233
arguments: [
234-
if (codeConfig.targetOS == OS.android) ...[
234+
if (codeConfig.targetOS == .android) ...[
235235
'--target='
236236
'${androidNdkClangTargetFlags[architecture]!}'
237237
'${targetAndroidNdkApi!}',
238238
'--sysroot=${androidSysroot(toolInstance).toFilePath()}',
239239
],
240-
if (codeConfig.targetOS == OS.windows)
240+
if (codeConfig.targetOS == .windows)
241241
'--target=${clangWindowsTargetFlags[architecture]!}',
242-
if (codeConfig.targetOS == OS.macOS)
242+
if (codeConfig.targetOS == .macOS)
243243
'--target=${appleClangMacosTargetFlags[architecture]!}',
244-
if (codeConfig.targetOS == OS.iOS)
244+
if (codeConfig.targetOS == .iOS)
245245
'--target=${appleClangIosTargetFlags[architecture]![targetIosSdk]!}',
246246
if (targetIOSVersion != null) '-mios-version-min=$targetIOSVersion',
247247
if (targetMacOSVersion != null)
248248
'-mmacos-version-min=$targetMacOSVersion',
249-
if (codeConfig.targetOS == OS.iOS) ...[
249+
if (codeConfig.targetOS == .iOS) ...[
250250
'-isysroot',
251251
(await iosSdk(targetIosSdk!, context)).toFilePath(),
252252
],
253-
if (codeConfig.targetOS == OS.macOS) ...[
253+
if (codeConfig.targetOS == .macOS) ...[
254254
'-isysroot',
255255
(await macosSdk(context)).toFilePath(),
256256
],
@@ -260,7 +260,7 @@ class RunCBuilder {
260260
],
261261
if (pic != null)
262262
if (toolInstance.tool.isClangLike &&
263-
codeConfig.targetOS != OS.windows) ...[
263+
codeConfig.targetOS != .windows) ...[
264264
if (pic!) ...[
265265
if (dynamicLibrary != null) '-fPIC',
266266
// Using PIC for static libraries allows them to be linked into
@@ -291,18 +291,17 @@ class RunCBuilder {
291291
],
292292
],
293293
if (std != null) '-std=$std',
294-
if (language == Language.cpp) ...[
294+
if (language == .cpp) ...[
295295
'-x',
296296
'c++',
297297
'-l',
298298
cppLinkStdLib ?? defaultCppLinkStdLib[codeConfig.targetOS]!,
299299
],
300-
if (optimizationLevel != OptimizationLevel.unspecified)
301-
optimizationLevel.clangFlag(),
300+
if (optimizationLevel != .unspecified) optimizationLevel.clangFlag(),
302301
// Support Android 15 page size by default, can be overridden by
303302
// passing [flags].
304-
if (codeConfig.targetOS == OS.android) '-Wl,-z,max-page-size=16384',
305-
if (codeConfig.targetOS == OS.iOS || codeConfig.targetOS == OS.macOS)
303+
if (codeConfig.targetOS == .android) '-Wl,-z,max-page-size=16384',
304+
if (codeConfig.targetOS == .iOS || codeConfig.targetOS == .macOS)
306305
'-Wl,-encryptable',
307306
...flags,
308307
for (final MapEntry(key: name, :value) in defines.entries)
@@ -319,7 +318,7 @@ class RunCBuilder {
319318
)
320319
else
321320
...sourceFiles,
322-
if (language == Language.objectiveC) ...[
321+
if (language == .objectiveC) ...[
323322
for (final framework in frameworks) ...['-framework', framework],
324323
],
325324
if (executable != null) ...[
@@ -335,7 +334,7 @@ class RunCBuilder {
335334
outFile!.toFilePath(),
336335
],
337336
if (executable != null || dynamicLibrary != null) ...[
338-
if (codeConfig.targetOS case OS.android || OS.linux)
337+
if (codeConfig.targetOS case .android || .linux)
339338
// During bundling code assets are all placed in the same directory.
340339
// Setting this rpath allows the binary to find other code assets
341340
// it is linked against.
@@ -364,10 +363,9 @@ class RunCBuilder {
364363
final result = await runProcess(
365364
executable: tool.uri,
366365
arguments: [
367-
if (optimizationLevel != OptimizationLevel.unspecified)
368-
optimizationLevel.msvcFlag(),
366+
if (optimizationLevel != .unspecified) optimizationLevel.msvcFlag(),
369367
if (std != null) '/std:$std',
370-
if (language == Language.cpp) '/TP',
368+
if (language == .cpp) '/TP',
371369
...flags,
372370
for (final MapEntry(key: name, :value) in defines.entries)
373371
if (value == null) '/D$name' else '/D$name=$value',

0 commit comments

Comments
 (0)