Skip to content

Rename BacktrackingScope to Local #239

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
Mar 31, 2022
Merged

Rename BacktrackingScope to Local #239

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
2 changes: 1 addition & 1 deletion Sources/RegexBuilder/DSL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public struct TryCapture<Output>: _BuiltinRegexComponent {

/// An atomic group, i.e. opens a local backtracking scope which, upon successful exit,
/// discards any remaining backtracking points from within the scope
public struct BacktrackingScope<Output>: _BuiltinRegexComponent {
public struct Local<Output>: _BuiltinRegexComponent {
public var regex: Regex<Output>

internal init(_ regex: Regex<Output>) {
Expand Down
44 changes: 22 additions & 22 deletions Sources/RegexBuilder/Variadics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ extension Repeat {
self.init(node: .repeating(expression.relative(to: 0..<Int.max), behavior, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
@_disfavoredOverload
public init<Component: RegexComponent>(
_ component: Component
Expand All @@ -1575,158 +1575,158 @@ extension BacktrackingScope {
}
}

extension BacktrackingScope {
extension Local {
@_disfavoredOverload
public init<Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == Substring {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0), Component.Output == (W, C0) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0), Component.Output == (W, C0) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1), Component.Output == (W, C0, C1) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1), Component.Output == (W, C0, C1) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2), Component.Output == (W, C0, C1, C2) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2), Component.Output == (W, C0, C1, C2) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3), Component.Output == (W, C0, C1, C2, C3) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3), Component.Output == (W, C0, C1, C2, C3) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4), Component.Output == (W, C0, C1, C2, C3, C4) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4), Component.Output == (W, C0, C1, C2, C3, C4) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5), Component.Output == (W, C0, C1, C2, C3, C4, C5) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5), Component.Output == (W, C0, C1, C2, C3, C4, C5) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, C8, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7, C8), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7, C8) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, C8, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7, C8), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7, C8) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component().regex.root))
}
}
extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, Component: RegexComponent>(
_ component: Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9) {
self.init(node: .nonCapturingGroup(.atomicNonCapturing, component.regex.root))
}
}

extension BacktrackingScope {
extension Local {
public init<W, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, Component: RegexComponent>(
@RegexComponentBuilder _ component: () -> Component
) where Output == (Substring, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9), Component.Output == (W, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/VariadicsGenerator/VariadicsGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ struct VariadicsGenerator: ParsableCommand {

func emitAtomicGroup(arity: Int) {
assert(arity >= 0)
let groupName = "BacktrackingScope"
let groupName = "Local"
func node(builder: Bool) -> String {
"""
.nonCapturingGroup(.atomicNonCapturing, component\(
Expand Down