aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-pcre/src
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (patch)
tree6a4c9e11a0d8e98dccf72a5857db73e74722489b /crates/shirabe-pcre/src
parent844097edf44bf1424d28e2d5fbefda90c1c8f46c (diff)
downloadphp-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.tar.gz
php-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.tar.zst
php-shirabe-34c74255d781ad0a0bf7cc5ad4ec1761bef61e04.zip
refactor(pcre): drop the two bespoke isMatch variants
is_match_named and is_match_with_indexed_captures reshaped a match into a name-keyed map or a number-positioned vec, each allocating a String per group up front for callers that then read one or two of them. Every one of the eleven call sites ports a plain Preg::isMatch in PHP, so they now call is_match3 and reach for the group they want through get(&CaptureKey::ByIndex(N)) / get(&CaptureKey::ByName(..)), the same way the rest of the tree already reads a match. Falling out of that: PregNamedGroups existed only to type the first variant; PregMatches::iter() only to build both; and PregMatches::pattern only to give iter() the capture names. PregMatches is now a plain wrapper over regex::Captures, so preg_replace_callback no longer clones the resolved pattern for every match, and preg_match_map! is internal to the shim again. SvnDriver::get_file_content and get_change_date recover the flat `isMatch(..) && $match[2] !== null` condition the PHP has, which the vec shape had forced into a nested if. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-pcre/src')
-rw-r--r--crates/shirabe-pcre/src/preg.rs38
1 files changed, 2 insertions, 36 deletions
diff --git a/crates/shirabe-pcre/src/preg.rs b/crates/shirabe-pcre/src/preg.rs
index 491e5371..753a4678 100644
--- a/crates/shirabe-pcre/src/preg.rs
+++ b/crates/shirabe-pcre/src/preg.rs
@@ -13,15 +13,10 @@
pub use shirabe_php_shim::{CaptureKey, PregMatches, PregMatchesAll, PregMatchesAllWithOffsets};
use shirabe_php_shim::{
- PregPattern, preg_grep, preg_match_all_offset_capture, preg_match_all2, preg_match_map,
- preg_match2, preg_replace_callback, preg_replace2,
+ PregPattern, preg_grep, preg_match_all_offset_capture, preg_match_all2, preg_match2,
+ preg_replace_callback, preg_replace2,
};
-preg_match_map! {
- /// The named capture groups of a single match, keyed by group name alone.
- pub struct PregNamedGroups(String => String);
-}
-
#[derive(Debug)]
pub struct Preg;
@@ -109,35 +104,6 @@ impl Preg {
Self::match4(pattern, subject, offset)
}
- pub fn is_match_named(pattern: impl PregPattern, subject: &str) -> Option<PregNamedGroups> {
- Some(
- preg_match2(pattern, subject, 0)?
- .iter()
- .filter_map(|(key, value)| match (key, value) {
- (CaptureKey::ByName(name), Some(value)) => Some((name, value.to_string())),
- _ => None,
- })
- .collect(),
- )
- }
-
- /// `is_match3` with the groups positioned by number rather than keyed, for callers that only
- /// read numbered groups. Index 0 is the full match; an unmatched group is `None`.
- pub fn is_match_with_indexed_captures(
- pattern: impl PregPattern,
- subject: &str,
- ) -> Option<Vec<Option<String>>> {
- Some(
- preg_match2(pattern, subject, 0)?
- .iter()
- .filter_map(|(key, value)| match key {
- CaptureKey::ByIndex(_) => Some(value.map(str::to_string)),
- CaptureKey::ByName(_) => None,
- })
- .collect(),
- )
- }
-
pub fn is_match_all(pattern: impl PregPattern, subject: &str) -> PregMatchesAll {
Self::match_all2(pattern, subject)
}