kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* encoding.c (enc_compatible_p): use TYPE not BUILTIN_TYPE.

Browse source 
[ruby-dev:36048]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-08-29 23:10:25 +00:00
parent 5159f500fd
commit 727625d9d4
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Sat Aug 30 07:48:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (enc_compatible_p): add SPECIAL_CONST_P check. * encoding.c (enc_compatible_p): add SPECIAL_CONST_P check.
[ruby-dev:36048]
* test/ruby/test_m17n.rb (test_compatible): fix test. * test/ruby/test_m17n.rb (test_compatible): fix test.

6
encoding.c
View file

@ -880,13 +880,11 @@ enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
{ {
rb_encoding *enc; rb_encoding *enc;
if (SPECIAL_CONST_P(str1) || if (SPECIAL_CONST_P(str1) || TYPE(str1) != T_STRING && TYPE(str1) != T_REGEXP) {
BUILTIN_TYPE(str1) != T_STRING && BUILTIN_TYPE(str1) != T_REGEXP) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)", rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)",
rb_obj_classname(str1)); rb_obj_classname(str1));
} }
if (SPECIAL_CONST_P(str2) || if (SPECIAL_CONST_P(str2) || TYPE(str2) != T_STRING && TYPE(str2) != T_REGEXP) {
BUILTIN_TYPE(str2) != T_STRING && BUILTIN_TYPE(str2) != T_REGEXP) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)", rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Regexp)",
rb_obj_classname(str2)); rb_obj_classname(str2));
} }