diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-19 17:02:29 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-19 17:02:29 +0000 |
commit | 77629d2cbe4931e3033ae73cef2e9adf6c1c0373 (patch) | |
tree | 9b75e0c5b7cffd99cebf28cb557f458b5bbfc974 | |
parent | a927483326e54e6a4e9387009af0b57f38636497 (diff) | |
download | ruby-77629d2cbe4931e3033ae73cef2e9adf6c1c0373.tar.gz |
* string.c (rb_str_rindex_m): too much adjustment.
* re.c (reg_match_pos): pos adjustment should be based on
characters.
* test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated
to check negative offset behavior.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | re.c | 3 | ||||
-rw-r--r-- | string.c | 1 | ||||
-rw-r--r-- | test/ruby/test_m17n.rb | 14 |
4 files changed, 23 insertions, 3 deletions
@@ -27,6 +27,14 @@ Wed Dec 19 22:59:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_rindex): comparison length should be based on bytes, not characters. + * string.c (rb_str_rindex_m): too much adjustment. + + * re.c (reg_match_pos): pos adjustment should be based on + characters. + + * test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated + to check negative offset behavior. + Wed Dec 19 21:42:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * re.c (rb_reg_regsub): should set checked encoding. @@ -2146,7 +2146,8 @@ reg_match_pos(VALUE re, VALUE *strp, long pos) *strp = str = reg_operand(str, Qtrue); if (pos != 0) { if (pos < 0) { - pos += RSTRING_LEN(str); + VALUE l = rb_str_length(str); + pos += NUM2INT(l); if (pos < 0) { return pos; } @@ -1650,7 +1650,6 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str) } /* fall through */ case T_STRING: - pos = str_sublen(str, pos, enc); pos = rb_str_rindex(str, sub, pos); if (pos >= 0) return LONG2NUM(pos); break; diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index 3681a8e15d..d723470dd2 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -1303,7 +1303,7 @@ class TestM17N < Test::Unit::TestCase end def test_str_insert - combination(STRINGS, -2..2, STRINGS) {|s1, nth, s2| + combination(STRINGS, 0..2, STRINGS) {|s1, nth, s2| t1 = s1.dup t2 = s1.dup begin @@ -1317,6 +1317,18 @@ class TestM17N < Test::Unit::TestCase assert_equal(t1, t2, "t=#{encdump s1}; t.insert(#{nth},#{encdump s2}); t") assert_equal(e1.class, e2.class, "begin #{encdump s1}.insert(#{nth},#{encdump s2}); rescue ArgumentError, IndexError => e; e end") } + combination(STRINGS, -2..-1, STRINGS) {|s1, nth, s2| + next if s1.length + nth < 0 + next unless s1.valid_encoding? + next unless s2.valid_encoding? + t1 = s1.dup + begin + t1.insert(nth, s2) + slen = s2.length + assert_equal(t1[nth-slen+1,slen], s2, "t=#{encdump s1}; t.insert(#{nth},#{encdump s2}); t") + rescue ArgumentError, IndexError => e + end + } end def test_str_intern |