mirror of
https://github.com/php/php-src.git
synced 2024-10-05 08:46:11 +00:00
67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
--- re.c.ruby_orig Fri Feb 7 15:35:26 2003
|
|
+++ re.c Tue Mar 18 18:51:21 2003
|
|
@@ -444,7 +444,7 @@ rb_reg_to_s(re)
|
|
kcode_set_option(re);
|
|
rp = ALLOC(Regexp);
|
|
MEMZERO((char *)rp, Regexp, 1);
|
|
- err = re_compile_pattern(++ptr, len -= 2, rp) != 0;
|
|
+ err = (re_compile_pattern(++ptr, len -= 2, rp, NULL) != 0);
|
|
kcode_reset_option();
|
|
re_free_pattern(rp);
|
|
}
|
|
@@ -538,7 +538,8 @@ make_regexp(s, len, flags)
|
|
int flags;
|
|
{
|
|
Regexp *rp;
|
|
- char *err;
|
|
+ char err[REG_MAX_ERROR_MESSAGE_LEN];
|
|
+ int r;
|
|
|
|
/* Handle escaped characters first. */
|
|
|
|
@@ -547,17 +548,18 @@ make_regexp(s, len, flags)
|
|
from that.
|
|
*/
|
|
|
|
- rp = ALLOC(Regexp);
|
|
- MEMZERO((char *)rp, Regexp, 1);
|
|
- rp->buffer = ALLOC_N(char, 16);
|
|
- rp->allocated = 16;
|
|
- rp->fastmap = ALLOC_N(char, 256);
|
|
+ r = re_alloc_pattern(&rp);
|
|
+ if (r) {
|
|
+ re_error_code_to_str((UChar* )err, r);
|
|
+ rb_reg_raise(s, len, err, 0);
|
|
+ }
|
|
+
|
|
if (flags) {
|
|
rp->options = flags;
|
|
}
|
|
- err = re_compile_pattern(s, len, rp);
|
|
+ r = re_compile_pattern(s, len, rp, err);
|
|
|
|
- if (err != NULL) {
|
|
+ if (r != 0) {
|
|
rb_reg_raise(s, len, err, 0);
|
|
}
|
|
return rp;
|
|
@@ -692,14 +694,14 @@ rb_reg_prepare_re(re)
|
|
}
|
|
|
|
if (need_recompile) {
|
|
- char *err;
|
|
+ char err[REG_MAX_ERROR_MESSAGE_LEN];
|
|
+ int r;
|
|
|
|
if (FL_TEST(re, KCODE_FIXED))
|
|
kcode_set_option(re);
|
|
rb_reg_check(re);
|
|
- RREGEXP(re)->ptr->fastmap_accurate = 0;
|
|
- err = re_compile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr);
|
|
- if (err != NULL) {
|
|
+ r = re_recompile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr, err);
|
|
+ if (r != 0) {
|
|
rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, re);
|
|
}
|
|
}
|