grep: avoid multi-character case folds#54
Open
wondr-wclabs wants to merge 1 commit into
Open
Conversation
Merging this PR will improve performance by 23.76%
Performance Changes
Tip Curious why this is faster? Comment Comparing Footnotes
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #32.
This changes the ignore-case compile path to use Oniguruma's per-regex
onig_new_deluxeAPI with the default case-fold flags minusINTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR.The important distinction is that this is not only an output formatting issue. With Oniguruma's default full-fold behavior, one regex atom can consume multiple input characters:
[[:alpha:]]can matchstas a single match, andßcan matchSS. That changes-ooutput, match counts, and cursor advancement. GNU grep avoids those multi-character fold expansions forgrep -i, so the matcher needs to stay on simple one-to-one folds even before broader locale support exists.I avoided
ONIG_OPTION_IGNORECASE_IS_ASCIIbecause that would be a broader behavioral change: it would discard non-ASCII simple folds too, while the incompatibility here is specifically the multi-character fold expansion. I also avoidedonig_set_default_case_fold_flagbecause it is process-global; using compile-timeOnigCompileInfokeeps the change local to each compiled regex and avoids races between different pattern compilations.The small raw wrapper mirrors the existing
onig::Regexshape where relevant: it serializes regex construction with a mutex, keeps the sameSend/Syncownership model for immutable compiled regexes, reusesonig::Region's transparent raw representation, and formats errors through Oniguruma's own error-message API.Validation:
cargo fmt --all -- --checkcargo testcargo clippy --all-targets --workspace -puu_grep -- -D warningsgit diff --checkprintf 'st\nss\nffi\n' | cargo run --quiet -- -o -i '[[:alpha:]]'now emits one character per lineprintf 'SS\n' | cargo run --quiet -- -o -i 'ß'exits 1 with no output