From 063beac3436cb94bf51cb9fec08b34e977563faa Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 7 Jan 2008 02:49:01 +0000 Subject: * encoding.c (rb_enc_internal_get_index): extracted from rb_enc_get_index. (rb_enc_internal_set_index): extracted from rb_enc_associate_index * include/ruby/encoding.h (ENCODING_SET): work over ENCODING_INLINE_MAX. (ENCODING_GET): ditto. (ENCODING_IS_ASCII8BIT): defined. (ENCODING_CODERANGE_SET): defined. * re.c (rb_reg_fixed_encoding_p): use ENCODING_IS_ASCII8BIT. * string.c (rb_enc_str_buf_cat): use ENCODING_IS_ASCII8BIT. * parse.y (reg_fragment_setenc_gen): use ENCODING_IS_ASCII8BIT. * marshal.c (has_ivars): use ENCODING_IS_ASCII8BIT. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index 55ef25b31b..29f26d0b2f 100644 --- a/marshal.c +++ b/marshal.c @@ -526,7 +526,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) st_data_t num; int hasiv = 0; #define has_ivars(obj, ivtbl) ((ivtbl = rb_generic_ivar_table(obj)) != 0 || \ - (!SPECIAL_CONST_P(obj) && ENCODING_GET(obj))) + (!SPECIAL_CONST_P(obj) && !ENCODING_IS_ASCII8BIT(obj))) if (limit == 0) { rb_raise(rb_eArgError, "exceed depth limit"); -- cgit v1.2.3