Provide literal pattern for convertible regexes #670
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
milseman
reviewed
May 20, 2023
| } | ||
| } | ||
|
|
||
| fileprivate struct LiteralPrinter { |
There was a problem hiding this comment.
Should this replace printAsCanonical, or merge them?
There was a problem hiding this comment.
This doesn't necessarily need to replace printAsCanonical, since they work on different things. If we have the AST -> DSL conversion, though, then this should be able to print anything, and we wouldn't need the existing AST printer any more. Not sure if we need the headache of keeping both in sync
Tests/RegexTests/MatchTests.swift
Outdated
| @@ -30,7 +44,8 @@ func _firstMatch( | |||
| ) throws -> (String, [String?])? { | |||
| var regex = try Regex(regexStr, syntax: syntax).matchingSemantics(semanticLevel) | |||
| let result = try regex.firstMatch(in: input) | |||
|
|
|||
| try _roundTripLiteral(regexStr, syntax: syntax) | |||
There was a problem hiding this comment.
Long term, we'll want to sink this deeper into the library.
For this, I think we'd also want to test parity for parse only tests.
|
What needs to be done to get this further along? |
natecook1000
force-pushed
the
literal_printer
branch
from
dd2235f to
84a58c2
Compare
Closed
natecook1000
force-pushed
the
literal_printer
branch
3 times, most recently
from
00a7c42 to
2d1ba4d
Compare
|
@swift-ci Please test |
This adds an (SPI) API for converting a `Regex` instance to a regex literal when possible, whether the regex starts as a literal, a run-time-constructed regex, or using the RegexBuilder syntax. The `_literalPattern` is round-trippable, so a regex created from a `_literalPattern` will have that same `_literalPattern`, but it could be different from the original pattern used to create a regex.
This adds another confirmation test, as part of the parse testing. When a parsing test is expected to succeed, and contains supported syntax, this checks that a round-tripped literal pattern maintains its identity.
Add an example of a pattern that is different from, but equivalent to, the original regex.
natecook1000
force-pushed
the
literal_printer
branch
from
49e211e to
e628267
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows platform |
|
@swift-ci Please test |
natecook1000
added a commit
that referenced
this pull request
Dec 13, 2023
This adds an (SPI) API for converting a `Regex` instance to a regex literal when possible, whether the regex starts as a literal, a run-time-constructed regex, or using the RegexBuilder syntax. The `_literalPattern` is round-trippable, so a regex created from a `_literalPattern` will have that same `_literalPattern`, but it could be different from the original pattern used to create a regex. This adds another confirmation test, as part of the parse testing. When a parsing test is expected to succeed, and contains supported syntax, this checks that a round-tripped literal pattern maintains its identity.
natecook1000
added a commit
that referenced
this pull request
Jan 9, 2024
This adds an (SPI) API for converting a `Regex` instance to a regex literal when possible, whether the regex starts as a literal, a run-time-constructed regex, or using the RegexBuilder syntax. The `_literalPattern` is round-trippable, so a regex created from a `_literalPattern` will have that same `_literalPattern`, but it could be different from the original pattern used to create a regex. This adds another confirmation test, as part of the parse testing. When a parsing test is expected to succeed, and contains supported syntax, this checks that a round-tripped literal pattern maintains its identity.
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.
This adds an (SPI) API for converting a
Regexinstance to a regex literal when possible, whether the regex starts as a literal, a run-time-constructed regex, or using the RegexBuilder syntax. The_literalPatternis round-trippable, so a regex created from a_literalPatternwill have that same_literalPattern, but it could be different from the original pattern used to create a regex.This is an alternative to #667, in that a library using
Regexas a dependency could create a composed printable regex type with the required semantics.