diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | re.c | 2 | ||||
| -rw-r--r-- | string.c | 11 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 20 insertions, 5 deletions
@@ -1,3 +1,12 @@ +Tue Jun 30 17:44:24 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * re.c (reg_match_pos): adjust offset based on characters, not + bytes. [ruby-dev:38722] + + * string.c (rb_str_offset): new function. + + * string.c (rb_str_index_m): no call to rb_reg_adjust_startpos(). + Tue Jun 30 16:48:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/compile_prelude.rb: use US-ASCII name. diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 5a6cd60641..a7c77a8c61 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -625,6 +625,7 @@ void rb_str_setter(VALUE, ID, VALUE*); VALUE rb_str_intern(VALUE); VALUE rb_sym_to_s(VALUE); VALUE rb_str_length(VALUE); +long rb_str_offset(VALUE, long); size_t rb_str_capacity(VALUE); #if defined __GNUC__ #define rb_str_new_cstr(str) __extension__ ( \ @@ -2546,7 +2546,7 @@ reg_match_pos(VALUE re, VALUE *strp, long pos) return pos; } } - pos = rb_reg_adjust_startpos(re, str, pos, 0); + pos = rb_str_offset(str, pos); } return rb_reg_search(re, str, pos, 0); } @@ -1357,6 +1357,13 @@ str_offset(const char *p, const char *e, int nth, rb_encoding *enc, int singleby return pp - p; } +long +rb_str_offset(VALUE str, long pos) +{ + return str_offset(RSTRING_PTR(str), RSTRING_END(str), pos, + STR_ENC_GET(str), single_byte_optimizable(str)); +} + #ifdef NONASCII_MASK static char * str_utf8_nth(const char *p, const char *e, int nth) @@ -2372,9 +2379,8 @@ rb_str_index_m(int argc, VALUE *argv, VALUE str) switch (TYPE(sub)) { case T_REGEXP: pos = str_offset(RSTRING_PTR(str), RSTRING_END(str), pos, - rb_enc_check(str, sub), single_byte_optimizable(str)); + rb_enc_check(str, sub), single_byte_optimizable(str)); - pos = rb_reg_adjust_startpos(sub, str, pos, 0); pos = rb_reg_search(sub, str, pos, 0); pos = rb_str_sublen(str, pos); break; @@ -2489,7 +2495,6 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) STR_ENC_GET(str), single_byte_optimizable(str)); if (!RREGEXP(sub)->ptr || RREGEXP_SRC_LEN(sub)) { - pos = rb_reg_adjust_startpos(sub, str, pos, 1); pos = rb_reg_search(sub, str, pos, 1); pos = rb_str_sublen(str, pos); } @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 212 +#define RUBY_PATCHLEVEL 213 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |