From 0caac63bacefb9a1f62848636d47fca07f592bba Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(preg): split PregMatches reads into get() and name() PregMatches keyed both forms of a capture group through CaptureKey, so every read built one: a usize wrapped in an enum, or worse, a String allocated to name a group that regex::Captures can look up from a &str. It now mirrors regex::Captures instead -- get() takes the group number, name() the group name -- and the enum drops out of the type entirely. That is 285 call sites across 59 files, and the named ones carry most of the win: `matches.get(&CaptureKey::ByName("host".to_string()))` reads as `matches.name("host")`. ProcessExecutor loses a `user_key` binding that existed only to build the key once. CaptureKey stays as the key type of PregMatchesAll and PregMatchesAllWithOffsets, where numbered and named entries share one IndexMap and a key type is the point. Five files still name it. Also retargets the two preg_match_all comments that described the occurrence count through `matches[&CaptureKey::ByIndex(0)].len()`, an Index impl these types no longer carry. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe-symfony-process/src/process.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'crates/shirabe-symfony-process/src/process.rs') diff --git a/crates/shirabe-symfony-process/src/process.rs b/crates/shirabe-symfony-process/src/process.rs index 0f7d3814..6a42d263 100644 --- a/crates/shirabe-symfony-process/src/process.rs +++ b/crates/shirabe-symfony-process/src/process.rs @@ -12,8 +12,8 @@ use crate::pipes::windows_pipes::WindowsPipes; use crate::process_utils::ProcessUtils; use indexmap::IndexMap; use shirabe_php_shim::{ - CaptureKey, Descriptor, PhpMixed, PhpResource, PregMatches, php_regex, preg_match, - preg_replace, preg_replace_callback, + Descriptor, PhpMixed, PhpResource, PregMatches, php_regex, preg_match, preg_replace, + preg_replace_callback, }; use std::sync::OnceLock; @@ -939,11 +939,8 @@ impl Process { ) | [^"]*+ )"/x"# ), |m: &PregMatches| -> anyhow::Result { - let m0 = m - .get(&CaptureKey::ByIndex(0)) - .unwrap_or_default() - .to_string(); - let m1 = m.get(&CaptureKey::ByIndex(1)).map(str::to_string); + let m0 = m.get(0).unwrap_or_default().to_string(); + let m1 = m.get(1).map(str::to_string); if m1.is_none() { return Ok(m0); } @@ -1072,10 +1069,7 @@ impl Process { preg_replace_callback( php_regex!(r#"/"\$\{:([_a-zA-Z]+[_a-zA-Z0-9]*)\}"/"#), |matches: &PregMatches| -> anyhow::Result { - let key = matches - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let key = matches.get(1).unwrap_or_default().to_string(); match env.get(&key) { None => Err(InvalidArgumentException::new(format!( "Command line is missing a value for parameter \"{}\": {}", -- cgit v1.3.1-4-g156e