nobu	2009-02-25 02:28:56 +0900 (Wed, 25 Feb 2009)

  New Revision: 22608

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22608

  Log:
    * string.c (rb_str_chomp_bang): coderange may change.
      [ruby-core:22414]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/test/ruby/test_string.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22607)
+++ ChangeLog	(revision 22608)
@@ -1,3 +1,8 @@
+Wed Feb 25 02:28:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_chomp_bang): coderange may change.
+	  [ruby-core:22414]
+
 Wed Feb 25 02:17:30 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_delete_bang): should recalculate coderange.
Index: string.c
===================================================================
--- string.c	(revision 22607)
+++ string.c	(revision 22608)
@@ -6056,7 +6056,7 @@
 	 memcmp(RSTRING_PTR(rs), pp, rslen) == 0)) {
 	if (rb_enc_left_char_head(p, pp, e, enc) != pp)
 	    return Qnil;
-	str_modify_keep_cr(str);
+	rb_str_modify(str);
 	STR_SET_LEN(str, RSTRING_LEN(str) - rslen);
 	RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';
 	return str;
Index: test/ruby/test_string.rb
===================================================================
--- test/ruby/test_string.rb	(revision 22607)
+++ test/ruby/test_string.rb	(revision 22608)
@@ -339,6 +339,8 @@
     assert_equal(S("hello"), S("hello").chomp)
     assert_equal(S("hello"), S("hello!").chomp)
     $/ = save
+
+    assert_equal(S("a").hash, S("a\u0101").chomp(S("\u0101")).hash, '[ruby-core:22414]')
   end
 
   def test_chomp!
@@ -393,6 +395,8 @@
     s = "foo\r"
     s.chomp!("")
     assert_equal("foo\r", s)
+
+    assert_equal(S("a").hash, S("a\u0101").chomp!(S("\u0101")).hash, '[ruby-core:22414]')
   end
 
   def test_chop

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/