averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42217 from artemcm/BareBonesRegexSyntax

Browse Source 
Rename flag for enabling forward slash literals to be less ambiguous.
This commit is contained in:
Artem Chikin
2022-04-11 16:40:23 -07:00
committed by GitHub
parent 87155f9baa 7ba377b3c2
commit b3726d097b
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/Option/Options.td
View File

@@ -676,9 +676,9 @@ def disable_actor_data_race_checks :
Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>, Flags<[FrontendOption, DoesNotAffectIncrementalBuild]>,
HelpText<"Disable runtime checks for actor data races">; HelpText<"Disable runtime checks for actor data races">;
def enable_regex_literals : Flag<["-"], "enable-regex-literals">, def enable_bare_slash_regex : Flag<["-"], "enable-bare-slash-regex">,
Flags<[FrontendOption, ModuleInterfaceOptionIgnorable]>, Flags<[FrontendOption, ModuleInterfaceOptionIgnorable]>,
HelpText<"Enable the use of regular-expression literals">; HelpText<"Enable the use of forward slash regular-expression literal syntax">;
def warn_implicit_overrides : def warn_implicit_overrides :
Flag<["-"], "warn-implicit-overrides">, Flag<["-"], "warn-implicit-overrides">,

2
lib/Driver/ToolChains.cpp
View File

@@ -298,7 +298,7 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
options::OPT_verify_incremental_dependencies); options::OPT_verify_incremental_dependencies);
inputArgs.AddLastArg(arguments, options::OPT_access_notes_path); inputArgs.AddLastArg(arguments, options::OPT_access_notes_path);
inputArgs.AddLastArg(arguments, options::OPT_library_level); inputArgs.AddLastArg(arguments, options::OPT_library_level);
inputArgs.AddLastArg(arguments, options::OPT_enable_regex_literals); inputArgs.AddLastArg(arguments, options::OPT_enable_bare_slash_regex);
inputArgs.AddLastArg(arguments, options::OPT_async_main); inputArgs.AddLastArg(arguments, options::OPT_async_main);
// Pass on any build config options // Pass on any build config options

2
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1010,7 +1010,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
if (Args.hasArg(OPT_disable_requirement_machine_reuse)) if (Args.hasArg(OPT_disable_requirement_machine_reuse))
Opts.EnableRequirementMachineReuse = false; Opts.EnableRequirementMachineReuse = false;
if (Args.hasArg(OPT_enable_regex_literals)) if (Args.hasArg(OPT_enable_bare_slash_regex))
Opts.EnableForwardSlashRegexLiterals = true; Opts.EnableForwardSlashRegexLiterals = true;
if (Args.hasArg(OPT_enable_requirement_machine_opaque_archetypes)) if (Args.hasArg(OPT_enable_requirement_machine_opaque_archetypes))

2
lib/Option/features.json
View File

@@ -22,7 +22,7 @@
"name": "empty-abi-descriptor" "name": "empty-abi-descriptor"
}, },
{ {
"name": "enable-regex-literals" "name": "enable-bare-slash-regex"
} }
] ]
} }

4
test/Driver/enable_regex_literals_flag.swift
View File

@@ -1,9 +1,9 @@
// RUN: %target-swiftc_driver -enable-regex-literals -disallow-use-new-driver -driver-print-jobs %s 2>^1 | %FileCheck %s // RUN: %target-swiftc_driver -enable-bare-slash-regex -disallow-use-new-driver -driver-print-jobs %s 2>^1 | %FileCheck %s
// The new driver has its own test for this // The new driver has its own test for this
// REQUIRES: cplusplus_driver // REQUIRES: cplusplus_driver
// CHECK: {{.*}}swift{{c|-frontend}}{{(.exe)?"?}} -frontend{{.*}}-enable-regex-literals // CHECK: {{.*}}swift{{c|-frontend}}{{(.exe)?"?}} -frontend{{.*}}-enable-bare-slash-regex
public func foo() -> Int { public func foo() -> Int {
return 42 return 42

4
test/ModuleInterface/option-preservation.swift
View File

@@ -1,6 +1,6 @@
// RUN: %empty-directory(%t) // RUN: %empty-directory(%t)
// 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 // 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
// RUN: %FileCheck %s < %t.swiftinterface -check-prefix=CHECK-SWIFTINTERFACE // RUN: %FileCheck %s < %t.swiftinterface -check-prefix=CHECK-SWIFTINTERFACE
// //
// CHECK-SWIFTINTERFACE: swift-module-flags: // CHECK-SWIFTINTERFACE: swift-module-flags:
@@ -10,7 +10,7 @@
// CHECK-SWIFTINTERFACE-SAME: -autolink-force-load // CHECK-SWIFTINTERFACE-SAME: -autolink-force-load
// CHECK-SWIFTINTERFACE: swift-module-flags-ignorable: // CHECK-SWIFTINTERFACE: swift-module-flags-ignorable:
// CHECK-SWIFTINTERFACE-SAME: -target-min-inlining-version 42 // CHECK-SWIFTINTERFACE-SAME: -target-min-inlining-version 42
// CHECK-SWIFTINTERFACE-SAME: -enable-regex-literals // CHECK-SWIFTINTERFACE-SAME: -enable-bare-slash-regex
// Make sure flags show up when filelists are enabled // Make sure flags show up when filelists are enabled