Skip to content

Commit 7ba377b

Browse files
committed
Rename flag for enabling forward slash literals to be less ambiguous.
Previous spelling could easily be mistaken for gating the entire feature. Part of rdar://91119995
1 parent 25232e8 commit 7ba377b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

include/swift/Option/Options.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,9 @@ def disable_actor_data_race_checks :
680680
Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
681681
HelpText<"Disable runtime checks for actor data races">;
682682

683-
def enable_regex_literals : Flag<["-"], "enable-regex-literals">,
683+
def enable_bare_slash_regex : Flag<["-"], "enable-bare-slash-regex">,
684684
Flags<[FrontendOption, ModuleInterfaceOptionIgnorable]>,
685-
HelpText<"Enable the use of regular-expression literals">;
685+
HelpText<"Enable the use of forward slash regular-expression literal syntax">;
686686

687687
def warn_implicit_overrides :
688688
Flag<["-"], "warn-implicit-overrides">,

lib/Driver/ToolChains.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
298298
options::OPT_verify_incremental_dependencies);
299299
inputArgs.AddLastArg(arguments, options::OPT_access_notes_path);
300300
inputArgs.AddLastArg(arguments, options::OPT_library_level);
301-
inputArgs.AddLastArg(arguments, options::OPT_enable_regex_literals);
301+
inputArgs.AddLastArg(arguments, options::OPT_enable_bare_slash_regex);
302302
inputArgs.AddLastArg(arguments, options::OPT_async_main);
303303

304304
// Pass on any build config options

lib/Frontend/CompilerInvocation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
10061006
if (Args.hasArg(OPT_disable_requirement_machine_reuse))
10071007
Opts.EnableRequirementMachineReuse = false;
10081008

1009-
if (Args.hasArg(OPT_enable_regex_literals))
1009+
if (Args.hasArg(OPT_enable_bare_slash_regex))
10101010
Opts.EnableForwardSlashRegexLiterals = true;
10111011

10121012
if (Args.hasArg(OPT_enable_requirement_machine_opaque_archetypes))

lib/Option/features.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"name": "empty-abi-descriptor"
2323
},
2424
{
25-
"name": "enable-regex-literals"
25+
"name": "enable-bare-slash-regex"
2626
}
2727
]
2828
}

test/Driver/enable_regex_literals_flag.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// RUN: %target-swiftc_driver -enable-regex-literals -disallow-use-new-driver -driver-print-jobs %s 2>^1 | %FileCheck %s
1+
// RUN: %target-swiftc_driver -enable-bare-slash-regex -disallow-use-new-driver -driver-print-jobs %s 2>^1 | %FileCheck %s
22
// The new driver has its own test for this
33

44
// REQUIRES: cplusplus_driver
55

6-
// CHECK: {{.*}}swift{{c|-frontend}}{{(.exe)?"?}} -frontend{{.*}}-enable-regex-literals
6+
// CHECK: {{.*}}swift{{c|-frontend}}{{(.exe)?"?}} -frontend{{.*}}-enable-bare-slash-regex
77

88
public func foo() -> Int {
99
return 42

test/ModuleInterface/option-preservation.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22

3-
// RUN: %target-swift-frontend -enable-library-evolution -emit-module-interface-path %t.swiftinterface -module-name t %s -target-min-inlining-version 42 -emit-module -o /dev/null -Onone -enforce-exclusivity=unchecked -autolink-force-load -enable-regex-literals
3+
// RUN: %target-swift-frontend -enable-library-evolution -emit-module-interface-path %t.swiftinterface -module-name t %s -target-min-inlining-version 42 -emit-module -o /dev/null -Onone -enforce-exclusivity=unchecked -autolink-force-load -enable-bare-slash-regex
44
// RUN: %FileCheck %s < %t.swiftinterface -check-prefix=CHECK-SWIFTINTERFACE
55
//
66
// CHECK-SWIFTINTERFACE: swift-module-flags:
@@ -10,7 +10,7 @@
1010
// CHECK-SWIFTINTERFACE-SAME: -autolink-force-load
1111
// CHECK-SWIFTINTERFACE: swift-module-flags-ignorable:
1212
// CHECK-SWIFTINTERFACE-SAME: -target-min-inlining-version 42
13-
// CHECK-SWIFTINTERFACE-SAME: -enable-regex-literals
13+
// CHECK-SWIFTINTERFACE-SAME: -enable-bare-slash-regex
1414

1515
// Make sure flags show up when filelists are enabled
1616

0 commit comments

Comments
 (0)