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 | 34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (patch) | |
| tree | 6a4c9e11a0d8e98dccf72a5857db73e74722489b /crates/shirabe/src/repository/vcs | |
| parent | 844097edf44bf1424d28e2d5fbefda90c1c8f46c (diff) | |
| download | php-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/src/repository/vcs')
| -rw-r--r-- | crates/shirabe/src/repository/vcs/svn_driver.rs | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index 9426e1f3..bdd7f021 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -258,16 +258,15 @@ impl SvnDriver { let identifier = format!("/{}/", trim(identifier, Some("/"))); let (path, rev) = if let Some(m) = - Preg::is_match_with_indexed_captures(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) + Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) + && let Some(rev) = m.get(&CaptureKey::ByIndex(2)) { - if m[2].is_some() { - ( - m[1].clone().unwrap_or_default(), - m[2].clone().unwrap_or_default(), - ) - } else { - (identifier.clone(), String::new()) - } + ( + m.get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(), + rev.to_string(), + ) } else { (identifier, String::new()) }; @@ -298,16 +297,15 @@ impl SvnDriver { let identifier = format!("/{}/", trim(identifier, Some("/"))); let (path, rev) = if let Some(m) = - Preg::is_match_with_indexed_captures(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) + Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) + && let Some(rev) = m.get(&CaptureKey::ByIndex(2)) { - if m[2].is_some() { - ( - m[1].clone().unwrap_or_default(), - m[2].clone().unwrap_or_default(), - ) - } else { - (identifier.clone(), String::new()) - } + ( + m.get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(), + rev.to_string(), + ) } else { (identifier, String::new()) }; |
