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/src/event_dispatcher | |
| 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/src/event_dispatcher')
| -rw-r--r-- | crates/shirabe/src/event_dispatcher/event_dispatcher.rs | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs index 8617ba8f..fd4b4663 100644 --- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs +++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs @@ -21,7 +21,7 @@ use crate::script::Event as ScriptEvent; use crate::util::Platform; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_rpc::{ PhpThrow, PluginValue, RustMethodDispatcher, RustObjHandle, call_function, call_function_with_dispatcher, call_php_method, call_static_method, @@ -956,13 +956,7 @@ try {{ if Platform::is_windows() { path_and_args = Preg::replace_callback( php_regex!("{^\\S+}"), - |m| { - str_replace( - "/", - "\\", - m.get(&CaptureKey::ByIndex(0)).unwrap(), - ) - }, + |m| str_replace("/", "\\", m.get(0).unwrap()), &path_and_args, ); } @@ -971,10 +965,7 @@ try {{ if let Some(m) = Preg::is_match3(php_regex!("{^[^\\'\"\\s/\\\\]+}"), &path_and_args) { - let m0 = m - .get(&CaptureKey::ByIndex(0)) - .unwrap_or_default() - .to_string(); + let m0 = m.get(0).unwrap_or_default().to_string(); if !file_exists(&m0) { let finder = ExecutableFinder::new(); if let Some(path_to_exec) = finder.find(&m0, None, &[]) { @@ -993,11 +984,7 @@ try {{ path_and_args = format!( "{}{}", path_to_exec, - substr( - &path_and_args, - strlen(m.get(&CaptureKey::ByIndex(0)).unwrap()), - None - ) + substr(&path_and_args, strlen(m.get(0).unwrap()), None) ); } } @@ -1013,13 +1000,7 @@ try {{ if Platform::is_windows() { exec = Preg::replace_callback( php_regex!("{^\\S+}"), - |m| { - str_replace( - "/", - "\\", - m.get(&CaptureKey::ByIndex(0)).unwrap(), - ) - }, + |m| str_replace("/", "\\", m.get(0).unwrap()), &exec, ); } |
