aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src
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-symfony-console/src
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-symfony-console/src')
-rw-r--r--crates/shirabe-symfony-console/src/helper/progress_bar.rs14
-rw-r--r--crates/shirabe-symfony-console/src/input/string_input.rs24
2 files changed, 14 insertions, 24 deletions
diff --git a/crates/shirabe-symfony-console/src/helper/progress_bar.rs b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
index 7a7a3c53..1ea55021 100644
--- a/crates/shirabe-symfony-console/src/helper/progress_bar.rs
+++ b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
@@ -9,7 +9,7 @@ use crate::output::OutputInterface;
use crate::output::output_interface;
use crate::terminal::Terminal;
use indexmap::IndexMap;
-use shirabe_php_shim::{CaptureKey, PregMatches, preg_replace_callback};
+use shirabe_php_shim::{PregMatches, preg_replace_callback};
pub const FORMAT_VERBOSE: &str = "verbose";
pub const FORMAT_VERY_VERBOSE: &str = "very_verbose";
@@ -799,10 +799,7 @@ impl ProgressBar {
// $callback in PHP, expressed as a closure over $this and the matches.
let callback = |matches: &PregMatches| -> anyhow::Result<String> {
- let name = matches
- .get(&CaptureKey::ByIndex(1))
- .unwrap_or_default()
- .to_string();
+ let name = matches.get(1).unwrap_or_default().to_string();
let text: shirabe_php_shim::PhpMixed =
if Self::get_placeholder_formatter_definition(&name).is_some() {
@@ -816,13 +813,10 @@ impl ProgressBar {
} else if let Some(message) = self.messages.get(&name) {
shirabe_php_shim::PhpMixed::String(message.clone())
} else {
- return Ok(matches
- .get(&CaptureKey::ByIndex(0))
- .unwrap_or_default()
- .to_string());
+ return Ok(matches.get(0).unwrap_or_default().to_string());
};
- if let Some(modifier) = matches.get(&CaptureKey::ByIndex(2)) {
+ if let Some(modifier) = matches.get(2) {
return Ok(shirabe_php_shim::sprintf(&format!("%{modifier}"), &[text]));
}
diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs
index 0dcc1a9d..1b14a2aa 100644
--- a/crates/shirabe-symfony-console/src/input/string_input.rs
+++ b/crates/shirabe-symfony-console/src/input/string_input.rs
@@ -6,7 +6,7 @@ use crate::input::InputDefinition;
use crate::input::InputInterface;
use crate::input::StreamableInputInterface;
use indexmap::IndexMap;
-use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex, preg_match2};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_match2};
/// StringInput represents an input provided as a string.
///
@@ -61,27 +61,23 @@ impl StringInput {
if token.is_some() {
tokens.push(token.take().unwrap());
}
- cursor += shirabe_php_shim::strlen(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""));
+ cursor += shirabe_php_shim::strlen(m.get(0).unwrap_or(""));
} else if let Some(m) = preg_match2(
format!(r#"/([^="'\s]+?)(=?)({}+)/A"#, Self::REGEX_QUOTED_STRING),
input,
cursor as usize,
) {
- let inner = shirabe_php_shim::substr(
- m.get(&CaptureKey::ByIndex(3)).unwrap_or(""),
- 1,
- Some(-1),
- );
+ let inner = shirabe_php_shim::substr(m.get(3).unwrap_or(""), 1, Some(-1));
let replaced =
shirabe_php_shim::str_replace_arr(&["\"'", "'\"", "''", "\"\""], "", &inner);
token = Some(format!(
"{}{}{}{}",
token.unwrap_or_default(),
- m.get(&CaptureKey::ByIndex(1)).unwrap_or(""),
- m.get(&CaptureKey::ByIndex(2)).unwrap_or(""),
+ m.get(1).unwrap_or(""),
+ m.get(2).unwrap_or(""),
shirabe_php_shim::stripcslashes(&replaced)
));
- cursor += shirabe_php_shim::strlen(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""));
+ cursor += shirabe_php_shim::strlen(m.get(0).unwrap_or(""));
} else if let Some(m) = preg_match2(
format!(r"/{}/A", Self::REGEX_QUOTED_STRING),
input,
@@ -91,12 +87,12 @@ impl StringInput {
"{}{}",
token.unwrap_or_default(),
shirabe_php_shim::stripcslashes(&shirabe_php_shim::substr(
- m.get(&CaptureKey::ByIndex(0)).unwrap_or(""),
+ m.get(0).unwrap_or(""),
1,
Some(-1)
))
));
- cursor += shirabe_php_shim::strlen(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""));
+ cursor += shirabe_php_shim::strlen(m.get(0).unwrap_or(""));
} else if let Some(m) = preg_match2(
format!(r"/{}/A", Self::REGEX_UNQUOTED_STRING),
input,
@@ -105,9 +101,9 @@ impl StringInput {
token = Some(format!(
"{}{}",
token.unwrap_or_default(),
- m.get(&CaptureKey::ByIndex(1)).unwrap_or("")
+ m.get(1).unwrap_or("")
));
- cursor += shirabe_php_shim::strlen(m.get(&CaptureKey::ByIndex(0)).unwrap_or(""));
+ cursor += shirabe_php_shim::strlen(m.get(0).unwrap_or(""));
} else {
// should never happen
return Err(InvalidArgumentException::new(format!(