diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | 0caac63bacefb9a1f62848636d47fca07f592bba (patch) | |
| tree | 8d2ef66e597a8d8c228d3ba2490a59f48b26db4d /crates/shirabe-symfony-finder | |
| parent | 34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (diff) | |
| download | php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.tar.gz php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.tar.zst php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.zip | |
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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-symfony-finder')
| -rw-r--r-- | crates/shirabe-symfony-finder/src/finder.rs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs index d3c76e3f..f25b144e 100644 --- a/crates/shirabe-symfony-finder/src/finder.rs +++ b/crates/shirabe-symfony-finder/src/finder.rs @@ -9,7 +9,7 @@ use crate::glob::Glob; use chrono::{NaiveDate, NaiveDateTime}; use indexmap::IndexSet; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_quote, rtrim}; use std::path::{Path, PathBuf}; use std::time::UNIX_EPOCH; @@ -644,10 +644,7 @@ fn is_regex(str: &str) -> bool { let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/"); if let Some(matches) = Preg::is_match3(&pattern, str) { - let group = matches - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let group = matches.get(1).unwrap_or_default().to_string(); let bytes = group.as_bytes(); let start = bytes .first() @@ -691,14 +688,11 @@ fn parse_date_comparator(test: &str) -> (String, i64) { panic!("Don't understand \"{test}\" as a date test."); }; - let date = matches - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let date = matches.get(2).unwrap_or_default().to_string(); let target = parse_datetime_to_unix(&date); let mut operator = matches - .get(&CaptureKey::ByIndex(1)) + .get(1) .map(str::to_string) .unwrap_or_else(|| "==".to_string()); if operator == "since" || operator == "after" { |
