Skip to content

Rename compiler _RegexParser module to _CompilerRegexParser. #42283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2022
Merged

Rename compiler _RegexParser module to _CompilerRegexParser. #42283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions SwiftCompilerSources/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
.library(
name: "Swift",
type: .static,
targets: ["SIL", "Optimizer", "_RegexParser"]),
targets: ["SIL", "Optimizer", "_CompilerRegexParser"]),
],
dependencies: [
],
Expand All @@ -26,8 +26,9 @@ let package = Package(
"-cross-module-optimization"
])]),
.target(
name: "_RegexParser",
name: "_CompilerRegexParser",
dependencies: [],
path: "_RegexParser",
swiftSettings: [
.unsafeFlags([
"-I", "../include/swift",
Expand All @@ -41,7 +42,7 @@ let package = Package(
])]),
.target(
name: "Optimizer",
dependencies: ["SIL", "_RegexParser"],
dependencies: ["SIL", "_CompilerRegexParser"],
swiftSettings: [SwiftSetting.unsafeFlags([
"-I", "../include/swift",
"-cross-module-optimization"
Expand Down
2 changes: 1 addition & 1 deletion SwiftCompilerSources/Sources/Optimizer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
set(dependencies)
list(APPEND dependencies Basic SIL)
if(SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING)
list(APPEND dependencies _RegexParser)
list(APPEND dependencies _CompilerRegexParser)
endif()

add_swift_compiler_module(Optimizer DEPENDS ${dependencies})
Expand Down
6 changes: 3 additions & 3 deletions SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
import SIL
import OptimizerBridging

#if canImport(_RegexParser)
import _RegexParser
#if canImport(_CompilerRegexParser)
import _CompilerRegexParser
#endif

@_cdecl("initializeSwiftModules")
public func initializeSwiftModules() {
registerSILClasses()
registerSwiftPasses()

#if canImport(_RegexParser)
#if canImport(_CompilerRegexParser)
registerRegexParser()
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion SwiftCompilerSources/Sources/_RegexParser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ foreach(source ${_LIBSWIFT_REGEX_PARSER_SOURCES})
endforeach()
message(STATUS "Using Experimental String Processing library for libswift _RegexParser (${EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR}).")

add_swift_compiler_module(_RegexParser
add_swift_compiler_module(_CompilerRegexParser
"${LIBSWIFT_REGEX_PARSER_SOURCES}"
Regex.swift)