aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-php-shim/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-php-shim/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-php-shim/src')
-rw-r--r--crates/shirabe-php-shim/src/preg.rs25
1 files changed, 13 insertions, 12 deletions
diff --git a/crates/shirabe-php-shim/src/preg.rs b/crates/shirabe-php-shim/src/preg.rs
index 2686bb59..1e3e9726 100644
--- a/crates/shirabe-php-shim/src/preg.rs
+++ b/crates/shirabe-php-shim/src/preg.rs
@@ -70,15 +70,16 @@ impl<'h> PregMatches<'h> {
Self { caps }
}
- /// The value of the group `key` names, or `None` if that group did not participate in the
- /// match. A group the pattern does not have reads as `None` too, matching how PHP reports a
- /// `$matches` entry that is not there.
- pub fn get(&self, key: &CaptureKey) -> Option<&'h str> {
- let group = match key {
- CaptureKey::ByIndex(index) => self.caps.get(*index),
- CaptureKey::ByName(name) => self.caps.name(name),
- };
- group.map(|group| group.as_str())
+ /// The value of the capture group at `index`, or `None` if that group did not participate in
+ /// the match. A group the pattern does not have reads as `None` too, matching how PHP reports
+ /// a `$matches` entry that is not there.
+ pub fn get(&self, index: usize) -> Option<&'h str> {
+ self.caps.get(index).map(|group| group.as_str())
+ }
+
+ /// The value of the capture group called `name`, under the same rules as `get`.
+ pub fn name(&self, name: &str) -> Option<&'h str> {
+ self.caps.name(name).map(|group| group.as_str())
}
}
@@ -183,7 +184,7 @@ pub fn preg_match_all(pattern: impl PregPattern, subject: &str) -> Vec<Vec<Optio
}
// The number of occurrences the caller would get from PHP's return value is the length of any
-// one column, `matches[&CaptureKey::ByIndex(0)].len()`.
+// one column, as `PregMatchesAll::occurrence_count` reports it.
pub fn preg_match_all2(pattern: impl PregPattern, subject: &str) -> PregMatchesAll {
let __resolved = pattern.resolve();
let (re, _anchored) = __resolved.parts();
@@ -229,8 +230,8 @@ pub fn preg_match_all_set_order(
}
// A non-participating group is reported as None, at offset -1. The number of occurrences the
-// caller would get from PHP's return value is the length of any one column,
-// `matches[&CaptureKey::ByIndex(0)].len()`.
+// caller would get from PHP's return value is the length of any one column, as
+// `PregMatchesAllWithOffsets::occurrence_count` reports it.
pub fn preg_match_all_offset_capture(
pattern: impl PregPattern,
subject: &str,