diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,12 @@ +Sat Aug 30 08:09:36 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE. + [ruby-dev:36048] + Sat Aug 30 07:48:48 2008 NARUSE, Yui <naruse@ruby-lang.org> * encoding.c (enc_compatible_p): add SPECIAL_CONST_P check. + [ruby-dev:36048] * test/ruby/test_m17n.rb (test_compatible): fix test. diff --git a/encoding.c b/encoding.c index bb6f5b269e..44e80b955f 100644 --- a/encoding.c +++ b/encoding.c @@ -880,13 +880,11 @@ enc_compatible_p(VALUE klass, VALUE str1, VALUE str2) { rb_encoding *enc; - if (SPECIAL_CONST_P(str1) || - BUILTIN_TYPE(str1) != T_STRING && BUILTIN_TYPE(str1) != T_REGEXP) { + if (SPECIAL_CONST_P(str1) || TYPE(str1) != T_STRING && TYPE(str1) != T_REGEXP) { rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)", rb_obj_classname(str1)); } - if (SPECIAL_CONST_P(str2) || - BUILTIN_TYPE(str2) != T_STRING && BUILTIN_TYPE(str2) != T_REGEXP) { + if (SPECIAL_CONST_P(str2) || TYPE(str2) != T_STRING && TYPE(str2) != T_REGEXP) { rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)", rb_obj_classname(str2)); } |