aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-finder/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
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe-symfony-finder/src
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
refactor(pcre): inline Preg into its call sites and drop the crate
Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-symfony-finder/src')
-rw-r--r--crates/shirabe-symfony-finder/src/finder.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs
index f25b144e..5befed2d 100644
--- a/crates/shirabe-symfony-finder/src/finder.rs
+++ b/crates/shirabe-symfony-finder/src/finder.rs
@@ -9,8 +9,7 @@
use crate::glob::Glob;
use chrono::{NaiveDate, NaiveDateTime};
use indexmap::IndexSet;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_quote, rtrim};
+use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_match2, preg_quote, rtrim};
use std::path::{Path, PathBuf};
use std::time::UNIX_EPOCH;
@@ -311,7 +310,7 @@ impl Finder {
let dir = rtrim(dir, Some("/"));
- if Preg::is_match(php_regex!("#^(ssh2\\.)?s?ftp://#"), &dir) {
+ if preg_match2(php_regex!("#^(ssh2\\.)?s?ftp://#"), &dir, 0).is_some() {
format!("{dir}/")
} else {
dir
@@ -592,7 +591,7 @@ fn exclude_accept(
};
let path = path.replace('\\', "/");
- return !Preg::is_match(pattern, &path);
+ return preg_match2(pattern, &path, 0).is_none();
}
true
@@ -619,14 +618,14 @@ fn to_regex_path(pattern: &str) -> String {
/// `MultiplePcreFilterIterator::isAccepted`.
fn is_accepted(string: &str, match_regexps: &[String], nomatch_regexps: &[String]) -> bool {
for regex in nomatch_regexps {
- if Preg::is_match(regex, string) {
+ if preg_match2(regex, string, 0).is_some() {
return false;
}
}
if !match_regexps.is_empty() {
for regex in match_regexps {
- if Preg::is_match(regex, string) {
+ if preg_match2(regex, string, 0).is_some() {
return true;
}
}
@@ -643,7 +642,7 @@ fn is_regex(str: &str) -> bool {
let available_modifiers = "imsxuADUn";
let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/");
- if let Some(matches) = Preg::is_match3(&pattern, str) {
+ if let Some(matches) = preg_match2(&pattern, str, 0) {
let group = matches.get(1).unwrap_or_default().to_string();
let bytes = group.as_bytes();
let start = bytes
@@ -656,7 +655,7 @@ fn is_regex(str: &str) -> bool {
.unwrap_or_default();
if start == end {
- return !Preg::is_match(php_regex!("/[*?[:alnum:] \\\\]/"), &start);
+ return preg_match2(php_regex!("/[*?[:alnum:] \\\\]/"), &start, 0).is_none();
}
for (open, close) in [("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")] {
@@ -684,7 +683,7 @@ fn comparator_test(operator: &str, test: i64, target: i64) -> bool {
/// `DateComparator::__construct`, returning `(operator, target unix timestamp)`.
fn parse_date_comparator(test: &str) -> (String, i64) {
let pattern = "#^\\s*(==|!=|[<>]=?|after|since|before|until)?\\s*(.+?)\\s*$#i";
- let Some(matches) = Preg::is_match3(pattern, test) else {
+ let Some(matches) = preg_match2(pattern, test, 0) else {
panic!("Don't understand \"{test}\" as a date test.");
};