0
@@ -1,3 +1,10 @@
0
+Thu May 15 23:01:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
0
+
0
+	* string.c (tr_find): String#delete returned wrong result when multiple
0
+	  utf-8 arguments are passed.
0
+
0
+	* test/ruby/test_m17n.rb (test_delete): add a test for above.
0
+
0
 Thu May 15 22:37:56 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
0
 
0
   * parse.y (ripper_warningS): now used.

0
@@ -4530,12 +4530,12 @@ tr_find(int c, char table[256], VALUE del, VALUE nodel)
0
     else {
0
   VALUE v = INT2NUM(c);
0
 
0
-	if (!del || NIL_P(rb_hash_lookup(del, v))) {
0
-	    return Qfalse;
0
+	if (del && !NIL_P(rb_hash_lookup(del, v))) {
0
+	    if (!nodel || NIL_P(rb_hash_lookup(nodel, v))) {
0
+		return Qtrue;
0
+	    }
0
   }
0
-	if (nodel && NIL_P(rb_hash_lookup(nodel, v)))
0
-	    return Qfalse;
0
-	return Qtrue;
0
+	return Qfalse;
0
     }
0
 }
0
 

0
@@ -894,6 +894,10 @@ class TestM17N < Test::Unit::TestCase
0
     assert_equal(1, e("\xa1\xa2").delete("z").length)
0
     s = e("\xa3\xb0\xa3\xb1\xa3\xb2\xa3\xb3\xa3\xb4")
0
     assert_raise(ArgumentError){s.delete(a("\xa3\xb2"))}
0
+
0
+    a = "\u3042\u3044\u3046\u3042\u3044\u3046"
0
+    a.delete!("\u3042\u3044", "^\u3044")
0
+    assert_equal("\u3044\u3046\u3044\u3046", a)
0
   end
0
 
0
   def test_include?