aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command
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/src/command
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/src/command')
-rw-r--r--crates/shirabe/src/command/fund_command.rs10
-rw-r--r--crates/shirabe/src/command/update_command.rs14
2 files changed, 11 insertions, 13 deletions
diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs
index 109943d6..22c94539 100644
--- a/crates/shirabe/src/command/fund_command.rs
+++ b/crates/shirabe/src/command/fund_command.rs
@@ -10,7 +10,7 @@ use crate::package::base_package::{self};
use crate::repository::CompositeRepository;
use crate::repository::RepositoryInterface;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{PhpMixed, impl_php_class, php_regex};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::MatchAllConstraint;
@@ -63,11 +63,9 @@ impl FundCommand {
.and_then(|v| v.as_string())
.unwrap_or("");
if r#type == "github"
- && let Some(matches) = Preg::is_match_with_indexed_captures(
- php_regex!(r"{^https://github.com/([^/]+)$}"),
- &url,
- )
- && let Some(sponsor) = matches.into_iter().nth(1).flatten()
+ && let Some(matches) =
+ Preg::is_match3(php_regex!(r"{^https://github.com/([^/]+)$}"), &url)
+ && let Some(sponsor) = matches.get(&CaptureKey::ByIndex(1)).map(str::to_string)
{
url = format!("https://github.com/sponsors/{}", sponsor);
}
diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs
index 2eca6db7..5c119489 100644
--- a/crates/shirabe/src/command/update_command.rs
+++ b/crates/shirabe/src/command/update_command.rs
@@ -27,7 +27,7 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositorySet;
use crate::util::HttpDownloader;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect,
array_keys, array_merge_map, array_search_in_vec, impl_php_class, php_regex, strtolower,
@@ -459,15 +459,15 @@ impl Command for UpdateCommand {
if package.is_dev() {
continue;
}
- let matches = Preg::is_match_with_indexed_captures(
- php_regex!(r"{^(\d+\.\d+\.\d+)}"),
- &package.get_version(),
- );
+ let version = package.get_version();
+ let matches = Preg::is_match3(php_regex!(r"{^(\d+\.\d+\.\d+)}"), &version);
let Some(matches) = matches else {
continue;
};
- let constraint = parser
- .parse_constraints(&format!("~{}", matches[1].clone().unwrap_or_default()))?;
+ let constraint = parser.parse_constraints(&format!(
+ "~{}",
+ matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default()
+ ))?;
if let Some(existing) = temporary_constraints.get(&package.get_name()) {
temporary_constraints.insert(
package.get_name(),