diff --git a/Tests/RegexBuilderTests/AlgorithmsTests.swift b/Tests/RegexBuilderTests/AlgorithmsTests.swift index 115941070..b85395d19 100644 --- a/Tests/RegexBuilderTests/AlgorithmsTests.swift +++ b/Tests/RegexBuilderTests/AlgorithmsTests.swift @@ -16,7 +16,7 @@ import RegexBuilder @available(SwiftStdlib 5.7, *) class RegexConsumerTests: XCTestCase { func testMatches() { - let regex = Capture(OneOrMore(.digit)) { 2 * Int($0)! } + let regex = Capture<(Substring, Int)>(OneOrMore(.digit)) { 2 * Int($0)! } let str = "foo 160 bar 99 baz" XCTAssertEqual(str.matches(of: regex).map(\.output.1), [320, 198]) } diff --git a/Tests/RegexBuilderTests/CustomTests.swift b/Tests/RegexBuilderTests/CustomTests.swift index 26746d613..848ef4626 100644 --- a/Tests/RegexBuilderTests/CustomTests.swift +++ b/Tests/RegexBuilderTests/CustomTests.swift @@ -64,7 +64,7 @@ private struct IntParser: CustomConsumingRegexComponent { guard index != bounds.upperBound else { return nil } let r = Regex { - Capture(OneOrMore(.digit)) { Int($0) } + Capture<(Substring, Int?)>(OneOrMore(.digit)) { Int($0) } } guard let match = input[index..(Repeat(.digit, count: 2)) { Int($0) } } } diff --git a/Tests/RegexBuilderTests/RegexDSLTests.swift b/Tests/RegexBuilderTests/RegexDSLTests.swift index 5e85ad26c..19ac675dc 100644 --- a/Tests/RegexBuilderTests/RegexDSLTests.swift +++ b/Tests/RegexBuilderTests/RegexDSLTests.swift @@ -1091,7 +1091,7 @@ class RegexDSLTests: XCTestCase { OneOrMore("a") Capture { TryCapture("b", transform: { Int($0) }) - ZeroOrMore( + ZeroOrMore<(Substring, Double?)>( TryCapture("c", transform: { Double($0) }) ) Optionally("e") @@ -1542,12 +1542,12 @@ class RegexDSLTests: XCTestCase { in bounds: Range ) throws -> (upperBound: String.Index, output: SemanticVersion)? { let regex = Regex { - TryCapture(OneOrMore(.digit)) { Int($0) } + TryCapture<(Substring, Int)>(OneOrMore(.digit)) { Int($0) } "." - TryCapture(OneOrMore(.digit)) { Int($0) } + TryCapture<(Substring, Int)>(OneOrMore(.digit)) { Int($0) } Optionally { "." - TryCapture(OneOrMore(.digit)) { Int($0) } + TryCapture<(Substring, Int)>(OneOrMore(.digit)) { Int($0) } } Optionally { "-" @@ -1876,7 +1876,7 @@ extension RegexDSLTests { ":" regexWithTooManyCaptures ":" - TryCapture(OneOrMore(.word)) { Int($0) } + TryCapture<(Substring, Int)>(OneOrMore(.word)) { Int($0) } #/:(\d+):/# } XCTAssert(type(of: dslWithTooManyCaptures).self