Skip to content

Move RegexComponent conformances to RegexBuilder #279

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 14, 2022
Merged
Show file tree
Hide file tree
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
34 changes: 34 additions & 0 deletions Sources/RegexBuilder/DSL.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,40 @@ extension _BuiltinRegexComponent {
}
}

// MARK: - Primitive regex components

extension String: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .quotedLiteral(self))
}
}

extension Substring: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .quotedLiteral(String(self)))
}
}

extension Character: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .atom(.char(self)))
}
}

extension UnicodeScalar: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .atom(.scalar(self)))
}
}

// MARK: - Combinators

// MARK: Concatenation
Expand Down
34 changes: 0 additions & 34 deletions Sources/_StringProcessing/Regex/Core.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,37 +95,3 @@ extension Regex {
}

}

// MARK: - Primitive regex components

extension String: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .quotedLiteral(self))
}
}

extension Substring: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .quotedLiteral(String(self)))
}
}

extension Character: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .atom(.char(self)))
}
}

extension UnicodeScalar: RegexComponent {
public typealias Output = Substring

public var regex: Regex<Output> {
.init(node: .atom(.scalar(self)))
}
}