Skip to content

[Printer] Unconditionally print a regex block for concatenations #508

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
Jun 21, 2022
Merged

[Printer] Unconditionally print a regex block for concatenations #508

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
17 changes: 13 additions & 4 deletions Sources/_StringProcessing/PrintAsPattern.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,15 @@ extension PrettyPrinter {
print("let \(namedCapture) = Reference(Substring.self)")
}

printBlock("Regex") { printer in
printer.printAsPattern(convertedFromAST: node)
switch node {
case .concatenation(_):
printAsPattern(convertedFromAST: node)
case .convertedRegexLiteral(.concatenation(_), _):
printAsPattern(convertedFromAST: node)
default:
printBlock("Regex") { printer in
printer.printAsPattern(convertedFromAST: node)
}
}
}

Expand All @@ -99,8 +106,10 @@ extension PrettyPrinter {
}

case let .concatenation(c):
c.forEach {
printAsPattern(convertedFromAST: $0)
printBlock("Regex") { printer in
c.forEach {
printer.printAsPattern(convertedFromAST: $0)
}
}

case let .nonCapturingGroup(kind, child):
Expand Down
20 changes: 9 additions & 11 deletions Tests/RegexTests/RenderDSLTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,17 @@ extension RenderDSLTests {
}
""")

try XCTExpectFailure("Concatenations in alternations aren't grouped") {
try testConversion(#"\da|b"#, """
Regex {
ChoiceOf {
Regex {
.digit
"a"
}
"bc"
try testConversion(#"\da|bc"#, """
Regex {
ChoiceOf {
Regex {
One(.digit)
"a"
}
"bc"
}
""")
}
}
""")
}

func testQuoting() throws {
Expand Down