* string.c (tr_find): String#delete returned wrong result when multiple

  utf-8 arguments are passed.

* test/ruby/test_m17n.rb (test_delete): add a test for above.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 5 deletions

diff --git a/string.c b/string.c
index 7fd09d0b3..67f1e33b1 100644
--- a/string.c
+++ b/string.c
@@ -4530,12 +4530,12 @@ tr_find(int c, char table[256], VALUE del, VALUE nodel)
     else {
 	VALUE v = INT2NUM(c);
 
-	if (!del || NIL_P(rb_hash_lookup(del, v))) {
-	    return Qfalse;
+	if (del && !NIL_P(rb_hash_lookup(del, v))) {
+	    if (!nodel || NIL_P(rb_hash_lookup(nodel, v))) {
+		return Qtrue;
+	    }
 	}
-	if (nodel && NIL_P(rb_hash_lookup(nodel, v)))
-	    return Qfalse;
-	return Qtrue;
+	return Qfalse;
     }
 }