From 704ba2d87733657dea852fa697fc6d23a961a71b Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 17 Aug 2026 04:18:59 +0900 Subject: refactor(preg): replace Preg::split*() with shim preg_split*() preg_split2()'s limit was always -1 and its flags were always either 0 or PREG_SPLIT_DELIM_CAPTURE alone, so both arguments are gone: the shim now exposes preg_split() and preg_split_delim_capture() over a shared preg_split_impl(). That leaves Preg::split()/split4() as bare pass-throughs, so callers use the shim functions directly and the wrappers are dropped along with the now-unreferenced PREG_SPLIT_* constants. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/tests/dependency_resolver/pool_builder_test.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/tests/dependency_resolver/pool_builder_test.rs') diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs index 23f25957..a4d118ee 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs @@ -20,8 +20,7 @@ use shirabe::repository::lock_array_repository::LockArrayRepository; use shirabe::repository::repository_factory::RepositoryFactory; use shirabe::repository::repository_set::{RepositorySet, RootAliasInput}; use shirabe_pcre::preg::Preg; -use shirabe_php_shim::PhpMixed; -use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture}; use std::path::PathBuf; /// Maps the PHP `$loadPackage` closure: pops the optional `id` from the data, loads the @@ -57,12 +56,7 @@ fn load_package( fn read_test_file(file: &str, fixtures_dir: &str) -> IndexMap { let contents = shirabe_php_shim::file_get_contents(file).unwrap(); - let tokens = Preg::split4( - php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), - &contents, - -1, - PREG_SPLIT_DELIM_CAPTURE, - ); + let tokens = preg_split_delim_capture(php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents); // PHP section_info is a map of name => required flag. let section_info: Vec<(&str, bool)> = vec![ -- cgit v1.3.1-4-g156e