aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/autoload
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
commit0caac63bacefb9a1f62848636d47fca07f592bba (patch)
tree8d2ef66e597a8d8c228d3ba2490a59f48b26db4d /crates/shirabe/src/autoload
parent34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (diff)
downloadphp-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/autoload')
-rw-r--r--crates/shirabe/src/autoload/autoload_generator.rs18
1 files changed, 6 insertions, 12 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs
index 7851182f..48f94263 100644
--- a/crates/shirabe/src/autoload/autoload_generator.rs
+++ b/crates/shirabe/src/autoload/autoload_generator.rs
@@ -23,7 +23,7 @@ use crate::util::Platform;
use indexmap::IndexMap;
use shirabe_class_map_generator::class_map::ClassMap;
use shirabe_class_map_generator::class_map_generator::ClassMapGenerator;
-use shirabe_pcre::{CaptureKey, Preg, PregMatches};
+use shirabe_pcre::{Preg, PregMatches};
use shirabe_php_shim::{
InvalidArgumentException, PhpMixed, array_keys, array_map, array_merge_map,
array_merge_recursive, array_shift, array_slice_strs, array_unique, bin2hex, explode,
@@ -562,7 +562,7 @@ return array(
if let Some(matches) =
Preg::match3(php_regex!("{ComposerAutoloaderInit([^:\\s]+)::}"), &content)
{
- suffix = matches.get(&CaptureKey::ByIndex(1)).map(str::to_string);
+ suffix = matches.get(1).map(str::to_string);
}
}
@@ -1153,7 +1153,7 @@ return array(
let links = array_merge_map(package.get_replaces(), package.get_provides());
for (_k, link) in &links {
if let Some(matches) = Preg::match3(php_regex!("{^ext-(.+)$}iD"), link.get_target())
- && let Some(ext) = matches.get(&CaptureKey::ByIndex(1)).map(str::to_string)
+ && let Some(ext) = matches.get(1).map(str::to_string)
{
extension_providers
.entry(ext)
@@ -1198,10 +1198,7 @@ return array(
&& let Some(matches) =
Preg::match3(php_regex!("{^ext-(.+)$}iD"), link.get_target())
{
- let ext_key = matches
- .get(&CaptureKey::ByIndex(1))
- .unwrap_or_default()
- .to_string();
+ let ext_key = matches.get(1).unwrap_or_default().to_string();
// skip extension checks if they have a valid provider/replacer
if let Some(provided_list) = extension_providers.get(&ext_key) {
for provided in provided_list {
@@ -1941,11 +1938,8 @@ class ComposerStaticInit{}
php_regex!("{^((?:(?:\\\\\\.){1,2}+/)+)}"),
|matches: &PregMatches| -> String {
// undo preg_quote for the matched string
- *updir_cell.borrow_mut() = Some(str_replace(
- "\\.",
- ".",
- matches.get(&CaptureKey::ByIndex(1)).unwrap_or(""),
- ));
+ *updir_cell.borrow_mut() =
+ Some(str_replace("\\.", ".", matches.get(1).unwrap_or("")));
String::new()
},