From 41bf214fd7273b2156e96dd600d57a578481daf1 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 15 May 2008 14:03:21 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@16426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 7fd09d0b3a..67f1e33b17 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; } } -- cgit v1.2.3