From 97219721752e7cc1eda51131d6a3cd753d37276c Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Thu, 27 Jul 2023 15:28:23 -0700 Subject: [PATCH] Resurrect rb_reg_prepare_re C API Existing strscan releases rely on this C API. It means that the current Ruby master doesn't work if your Gemfile.lock has strscan unless it's locked to 3.0.7, which is not released yet. To fix it, let's not remove the C API we've exposed to users. --- include/ruby/re.h | 21 +++++++++++++++++++++ re.c | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/ruby/re.h b/include/ruby/re.h index 52faeb1e98..f86d6f26cf 100644 --- a/include/ruby/re.h +++ b/include/ruby/re.h @@ -105,6 +105,27 @@ long rb_reg_adjust_startpos(VALUE re, VALUE str, long pos, int dir); */ VALUE rb_reg_quote(VALUE str); +/** + * Exercises various checks and preprocesses so that the given regular + * expression can be applied to the given string. The preprocess here includes + * (but not limited to) for instance encoding conversion. + * + * @param[in] re Target regular expression. + * @param[in] str What `re` is about to run on. + * @exception rb_eArgError `re` does not fit for `str`. + * @exception rb_eEncCompatError `re` and `str` are incompatible. + * @exception rb_eRegexpError `re` is malformed. + * @return A preprocessesed pattern buffer ready to be applied to `str`. + * @note The return value is manages by our GC. Don't free. + * + * @internal + * + * The return type, `regex_t *`, is defined in ``, _and_ + * _conflicts_ with POSIX's ``. We can no longer save the situation + * at this point. Just don't mix the two. + */ +regex_t *rb_reg_prepare_re(VALUE re, VALUE str); + /** * Runs a regular expression match using function `match`. Performs preparation, * error handling, and memory cleanup. diff --git a/re.c b/re.c index 5ae896d2aa..abab264f7d 100644 --- a/re.c +++ b/re.c @@ -1575,7 +1575,7 @@ rb_reg_prepare_enc(VALUE re, VALUE str, int warn) return enc; } -static regex_t * +regex_t * rb_reg_prepare_re(VALUE re, VALUE str) { int r;