Skip to content

Add remaining availability annotations. #283

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.

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 15, 2022
Merged
Changes from all commits
Commits
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
40 changes: 23 additions & 17 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let availabilityDefinition = PackageDescription.SwiftSetting.unsafeFlags([
"-Xfrontend",
"-define-availability",
"-Xfrontend",
#""SwiftStdlib 5.7:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999""#
#"SwiftStdlib 5.7:macOS 9999, iOS 9999, watchOS 9999, tvOS 9999"#,
])

let package = Package(
@@ -66,44 +66,50 @@ let package = Package(
.testTarget(
name: "RegexTests",
dependencies: ["_StringProcessing"],
swiftSettings: [availabilityDefinition]),
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])
]),
.testTarget(
name: "RegexBuilderTests",
dependencies: ["_StringProcessing", "RegexBuilder"],
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-enable-experimental-pairwise-build-block"]),
availabilityDefinition
.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])
]),
.target(
name: "Prototypes",
dependencies: ["_RegexParser", "_StringProcessing"],
swiftSettings: [availabilityDefinition]),
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])
]),

// MARK: Scripts
.executableTarget(
name: "VariadicsGenerator",
dependencies: [
.product(name: "ArgumentParser", package: "swift-argument-parser")
.product(name: "ArgumentParser", package: "swift-argument-parser")
]),
.executableTarget(
name: "PatternConverter",
dependencies: [
.product(name: "ArgumentParser", package: "swift-argument-parser"),
"_RegexParser",
"_StringProcessing"
.product(name: "ArgumentParser", package: "swift-argument-parser"),
"_RegexParser",
"_StringProcessing"
]),

// MARK: Exercises
.target(
name: "Exercises",
dependencies: ["_RegexParser", "Prototypes", "_StringProcessing", "RegexBuilder"],
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-enable-experimental-pairwise-build-block"]),
availabilityDefinition
]),
name: "Exercises",
dependencies: ["_RegexParser", "Prototypes", "_StringProcessing", "RegexBuilder"],
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-enable-experimental-pairwise-build-block"]),
.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])
]),
.testTarget(
name: "ExercisesTests",
dependencies: ["Exercises"],
swiftSettings: [availabilityDefinition]),
name: "ExercisesTests",
dependencies: ["Exercises"],
swiftSettings: [
.unsafeFlags(["-Xfrontend", "-disable-availability-checking"])
])
]
)
2 changes: 2 additions & 0 deletions Sources/RegexBuilder/Anchor.swift
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ public struct Anchor {
var isInverted: Bool = false
}

@available(SwiftStdlib 5.7, *)
extension Anchor: RegexComponent {
var astAssertion: AST.Atom.AssertionKind {
if !isInverted {
@@ -63,6 +64,7 @@ extension Anchor: RegexComponent {

// MARK: - Public API

@available(SwiftStdlib 5.7, *)
extension Anchor {
public static var startOfSubject: Anchor {
Anchor(kind: .startOfSubject)
7 changes: 7 additions & 0 deletions Sources/RegexBuilder/CharacterClass.swift
Original file line number Diff line number Diff line change
@@ -37,18 +37,21 @@ public struct CharacterClass {
}
}

@available(SwiftStdlib 5.7, *)
extension CharacterClass: RegexComponent {
public var regex: Regex<Substring> {
return Regex(node: DSLTree.Node.customCharacterClass(ccc))
}
}

@available(SwiftStdlib 5.7, *)
extension CharacterClass {
public var inverted: CharacterClass {
CharacterClass(ccc.inverted)
}
}

@available(SwiftStdlib 5.7, *)
extension RegexComponent where Self == CharacterClass {
public static var any: CharacterClass {
.init(DSLTree.CustomCharacterClass(members: [.atom(.any)]))
@@ -91,6 +94,7 @@ extension RegexComponent where Self == CharacterClass {
}
}

@available(SwiftStdlib 5.7, *)
extension RegexComponent where Self == CharacterClass {
/// Returns a character class that matches any character in the given string
/// or sequence.
@@ -112,6 +116,7 @@ extension RegexComponent where Self == CharacterClass {
}

// Unicode properties
@available(SwiftStdlib 5.7, *)
extension CharacterClass {
public static func generalCategory(_ category: Unicode.GeneralCategory) -> CharacterClass {
guard let extendedCategory = category.extendedGeneralCategory else {
@@ -179,6 +184,7 @@ extension Unicode.GeneralCategory {

// MARK: - Set algebra methods

@available(SwiftStdlib 5.7, *)
extension RegexComponent where Self == CharacterClass {
public init(_ first: CharacterClass, _ rest: CharacterClass...) {
if rest.isEmpty {
@@ -191,6 +197,7 @@ extension RegexComponent where Self == CharacterClass {
}
}

@available(SwiftStdlib 5.7, *)
extension CharacterClass {
public func union(_ other: CharacterClass) -> CharacterClass {
CharacterClass(.init(members: [
10 changes: 10 additions & 0 deletions Sources/RegexBuilder/DSL.swift
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
import _RegexParser
@_spi(RegexBuilder) import _StringProcessing

@available(SwiftStdlib 5.7, *)
extension Regex {
public init<Content: RegexComponent>(
@RegexComponentBuilder _ content: () -> Content
@@ -22,10 +23,12 @@ extension Regex {

// A convenience protocol for builtin regex components that are initialized with
// a `DSLTree` node.
@available(SwiftStdlib 5.7, *)
internal protocol _BuiltinRegexComponent: RegexComponent {
init(_ regex: Regex<RegexOutput>)
}

@available(SwiftStdlib 5.7, *)
extension _BuiltinRegexComponent {
init(node: DSLTree.Node) {
self.init(Regex(node: node))
@@ -34,6 +37,7 @@ extension _BuiltinRegexComponent {

// MARK: - Primitive regex components

@available(SwiftStdlib 5.7, *)
extension String: RegexComponent {
public typealias Output = Substring

@@ -42,6 +46,7 @@ extension String: RegexComponent {
}
}

@available(SwiftStdlib 5.7, *)
extension Substring: RegexComponent {
public typealias Output = Substring

@@ -50,6 +55,7 @@ extension Substring: RegexComponent {
}
}

@available(SwiftStdlib 5.7, *)
extension Character: RegexComponent {
public typealias Output = Substring

@@ -58,6 +64,7 @@ extension Character: RegexComponent {
}
}

@available(SwiftStdlib 5.7, *)
extension UnicodeScalar: RegexComponent {
public typealias Output = Substring

@@ -110,6 +117,7 @@ public struct QuantificationBehavior {
extension DSLTree.Node {
/// Generates a DSLTree node for a repeated range of the given DSLTree node.
/// Individual public API functions are in the generated Variadics.swift file.
@available(SwiftStdlib 5.7, *)
static func repeating(
_ range: Range<Int>,
_ behavior: QuantificationBehavior,
@@ -137,6 +145,7 @@ extension DSLTree.Node {
}
}

@available(SwiftStdlib 5.7, *)
extension QuantificationBehavior {
/// Match as much of the input string as possible, backtracking when
/// necessary.
@@ -304,6 +313,7 @@ public struct Reference<Capture>: RegexComponent {
}
}

@available(SwiftStdlib 5.7, *)
extension Regex.Match {
public subscript<Capture>(_ reference: Reference<Capture>) -> Capture {
self[reference.id]
1 change: 1 addition & 0 deletions Sources/RegexBuilder/Match.swift
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@

import _StringProcessing

@available(SwiftStdlib 5.7, *)
extension String {
@available(SwiftStdlib 5.7, *)
public func wholeMatch<R: RegexComponent>(
Loading