diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 12:54:17 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-17 12:54:17 +0000 |
commit | b8fd2fabbef7696b42e2802caf1daf1368cc099e (patch) | |
tree | 3e293253a3d854945344f4b37bd52e8b66d1b69d /re.c | |
parent | a197a30a94938a54543c35a3f55fbcd542d402b8 (diff) |
* re.c (rb_reg_prepare_re): add enable_warning parameter.
(rb_reg_adjust_startpos): disable warning by rb_reg_prepare_re.
(rb_reg_search): follow rb_reg_prepare_re parameter change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1041,7 +1041,7 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc, rb_encoding **fixed_enc, onig_errmsg_buffer err); static void -rb_reg_prepare_re(VALUE re, VALUE str) +rb_reg_prepare_re(VALUE re, VALUE str, int enable_warning) { int need_recompile = 0; rb_encoding *enc; @@ -1068,7 +1068,8 @@ rb_reg_prepare_re(VALUE re, VALUE str) RREGEXP(re)->ptr->enc != enc) { need_recompile = 1; } - if ((RBASIC(re)->flags & REG_ENCODING_NONE) && + if (enable_warning && + (RBASIC(re)->flags & REG_ENCODING_NONE) && enc != rb_ascii8bit_encoding() && rb_enc_str_coderange(str) != ENC_CODERANGE_7BIT) { rb_warn("regexp match /.../n against to %s string", @@ -1119,7 +1120,7 @@ rb_reg_adjust_startpos(VALUE re, VALUE str, int pos, int reverse) OnigEncoding enc; UChar *p, *string; - rb_reg_prepare_re(re, str); + rb_reg_prepare_re(re, str, 0); if (reverse) { range = -pos; @@ -1158,7 +1159,7 @@ rb_reg_search(VALUE re, VALUE str, int pos, int reverse) return -1; } - rb_reg_prepare_re(re, str); + rb_reg_prepare_re(re, str, 1); if (!reverse) { range += RSTRING_LEN(str); |