Skip to content

Refine message #454

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 29, 2025
+18 −8
Merged

Refine message #454

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
24 changes: 17 additions & 7 deletions Sources/ExpressionParser/ExpressionParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,27 @@ import Foundation
@testable @_spi(RegexBuilder) import _StringProcessing

struct ExpressionParser {
struct Modes {
let matchingOptions: [String]

var i: Bool { matchingOptions.contains("i") }
var s: Bool { matchingOptions.contains("s") }
}

private(set) var tokens = [Token]()
private(set) var diagnostics: Diagnostics?

private let pattern: String
private let insensitive: Bool
private let matchingOptions: [String]
private let modes: Modes

private var depth = 0
private var groupCount = 0

init(pattern: String, insensitive: Bool = true) {
init(pattern: String, matchingOptions: [String]) {
self.pattern = pattern
self.insensitive = insensitive
self.matchingOptions = matchingOptions
modes = Modes(matchingOptions: matchingOptions)
}

mutating func parse() {
Expand Down Expand Up @@ -516,7 +525,7 @@ struct ExpressionParser {
substitution = [
"{{getChar()}}": #""\#(c)""#,
"{{code}}": charcode,
"{{getInsensitive()}}": "Case \(insensitive ? "in" : "")sensitive"
"{{getInsensitive()}}": "Case \(modes.i ? "in" : "")sensitive"
]
} else {
`class` = "char"
Expand All @@ -525,7 +534,7 @@ struct ExpressionParser {
substitution = [
"{{getChar()}}": #""\#(c)""#,
"{{code}}": charcode,
"{{getInsensitive()}}": "Case \(insensitive ? "in" : "")sensitive"
"{{getInsensitive()}}": "Case \(modes.i ? "in" : "")sensitive"
]
}
case .scalar(let scalar):
Expand All @@ -535,7 +544,7 @@ struct ExpressionParser {
substitution = [
"{{getChar()}}": #""\#(String(scalar.value))""#,
"{{code}}": String(format: "U+%X", scalar.value.value),
"{{getInsensitive()}}": "Case \(insensitive ? "in" : "")sensitive"
"{{getInsensitive()}}": "Case \(modes.i ? "in" : "")sensitive"
]
case .scalarSequence(let scalarSequence):
let scalars = scalarSequence.scalars
Expand All @@ -548,7 +557,7 @@ struct ExpressionParser {
substitution = [
"{{getChar()}}": #""\#(value)""#,
"{{code}}": charcode,
"{{getInsensitive()}}": "Case \(insensitive ? "in" : "")sensitive"
"{{getInsensitive()}}": "Case \(modes.i ? "in" : "")sensitive"
]
case .property(let prop):
`class` = "charclass"
Expand Down Expand Up @@ -994,6 +1003,7 @@ struct ExpressionParser {
`class` = "charclass"
category = "charclasses"
key = "dot"
substitution = ["{{getDotAll()}}": "\(modes.s ? "including" : "except") line breaks"]
case .caretAnchor:
`class` = "anchor"
category = "anchors"
Expand Down
2 changes: 1 addition & 1 deletion Sources/ExpressionParser/Main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct Main {
.split(separator: ",", omittingEmptySubsequences: true)
.map { String($0) }

var parser = ExpressionParser(pattern: pattern, insensitive: matchingOptions.contains("i"))
var parser = ExpressionParser(pattern: pattern, matchingOptions: matchingOptions)
parser.parse()

let data = try JSONEncoder().encode(parser.tokens)
Expand Down