Throwing customization hooks #261
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds test to try out throwing custom code. Adds processor support.
|
@swift-ci please test |
|
I would like to add the following, but we don't take struct Poison: Error, Hashable {}
struct Overflow: Error, Hashable {}
let addressRegex = Regex {
"0x"
Capture(OneOrMore(.hexDigit)) { hex -> Int in
guard let i = Int(hex, radix: 16) else {
throw Overflow()
}
if i == 0xdeadbeef {
throw Poison()
}
return i
}
} |
rxwei
approved these changes
Apr 10, 2022
|
Added support for |
|
@rxwei it seems you beat me to the second commit by 4 minutes, drat. Care to take a look at the rest? |
|
What's the proposed new behavior? Is it the following:
|
|
Yes, that’s right |
|
LGTM |
|
The non-Optional-returning ones on TryCapture could probably be removed. |
|
Done. @swift-ci please test |
itingliu
added a commit
to itingliu/swift-experimental-string-processing
that referenced
this pull request
Apr 13, 2022
- Update the name `CustomRegexComponent` to `CustomMatchingRegexComponent` per pitch - Adopt `throws` for `CustomMatchingRegexComponent` as added in swiftlang#261. Errors thrown by `CustomMatchingRegexComponent`'s conformers will be bubbled up to the engine and surfaced at client-side.
itingliu
added a commit
to itingliu/swift-experimental-string-processing
that referenced
this pull request
Apr 13, 2022
- Update the name `CustomRegexComponent` to `CustomMatchingRegexComponent` per pitch - Adopt `throws` for `CustomMatchingRegexComponent` as added in swiftlang#261. Errors thrown by `CustomMatchingRegexComponent`'s conformers will be bubbled up to the engine and surfaced at client-side.
itingliu
added a commit
to itingliu/swift-experimental-string-processing
that referenced
this pull request
Apr 16, 2022
- Update the name `CustomRegexComponent` to `CustomMatchingRegexComponent` per pitch - Adopt `throws` for `CustomMatchingRegexComponent` as added in swiftlang#261. Errors thrown by `CustomMatchingRegexComponent`'s conformers will be bubbled up to the engine and surfaced at client-side.
Azoy
pushed a commit
to Azoy/swift-experimental-string-processing
that referenced
this pull request
Apr 19, 2022
* Throwing customization hooks * Adds test to try out throwing custom code. * Adds processor support. * Add throws to capture transform API, plumbing * Remove non-failable try-capture overloads
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 25, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 26, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename Output associated type to RegexOutput. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 27, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename `Output` associated type to `RegexOutput`. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
rxwei
added a commit
to rxwei/swift-evolution
that referenced
this pull request
Apr 27, 2022
Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename `Output` associated type to `RegexOutput`. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`.
airspeedswift
added a commit
to swiftlang/swift-evolution
that referenced
this pull request
Jul 6, 2022
* [SE-0351] Revise regex builder proposal Revision: - Capture takes throwing closures. (swiftlang/swift-experimental-string-processing#261) - Rename `Output` associated type to `RegexOutput`. (swiftlang/swift-experimental-string-processing#281) - Define primary associated type for `RegexComponent`. Clarification: - Clarify that `RegexComponent` and `Regex: RegexComponent` will be in the stdlib, not in `RegexBuilder`. - Make detailed design driven by example and move API definition to a collapsible. This is so that the complex result builder machinery won't obscure the API design. - Add alternative considered section about unifying `Capture` and `TryCapture`. * Add section about anchors and lookaheads * Add section re `mapOutput` * Move mapOutput to Regex instead of RegexComponent * Address comments. * Minor fix in RegexComponent declaration * Capture transform shouldn't be restricted to taking a `Substring` * Fix syntax highlighting * Update 0351-regex-builder.md * Revise `RegexComponentBuilder.buildPartialBlock(first:)`. Also fix broken links. * Update 0351-regex-builder.md Co-authored-by: Nate Cook <[email protected]> Co-authored-by: Stephen Canon <[email protected]> Co-authored-by: Ben Cohen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds test to try out throwing custom code. Adds processor support.