From f1d4a29e773cd4e594febfca46f3a5aed489dee3 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 4 Jul 2008 11:44:05 +0000 Subject: * include/ruby/oniguruma.h (OnigEncoding): removed auxiliary_data. * include/ruby/encoding.h (ENC_DUMMY_P): moved dummy encoding flag to rb_encoding from Encoding instance. * encoding.c (rb_encoding_list): list of Encoding instances. * encoding.c (struct rb_encoding_entry): moved base encoding from instance variable. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/encoding.h | 19 ++++++++++--------- include/ruby/oniguruma.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'include/ruby') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 45508c318..fcd87dc9a 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -70,7 +70,7 @@ typedef OnigEncodingType rb_encoding; int rb_enc_replicate(const char *, rb_encoding *); int rb_define_dummy_encoding(const char *); -#define rb_enc_to_index(enc) ((enc) ? ((enc)->ruby_encoding_index) : 0) +#define rb_enc_to_index(enc) ((enc) ? ENC_TO_ENCINDEX(enc) : 0) int rb_enc_get_index(VALUE obj); void rb_enc_set_index(VALUE obj, int encindex); int rb_enc_find_index(const char *name); @@ -176,20 +176,21 @@ VALUE rb_locale_charmap(VALUE klass); long rb_memsearch(const void*,long,const void*,long,rb_encoding*); RUBY_EXTERN VALUE rb_cEncoding; +#define enc_initialized_p(enc) ((enc)->ruby_encoding_index != ENC_UNINITIALIZED) +#define ENC_DUMMY_FLAG (1<<24) +#define ENC_INDEX_MASK (~(~0U<<24)) -#define ENC_UNINITIALIZED (&rb_cEncoding) -#define enc_initialized_p(enc) ((enc)->auxiliary_data != &rb_cEncoding) -#define ENC_FROM_ENCODING(enc) ((VALUE)(enc)->auxiliary_data) +#define ENC_TO_ENCINDEX(enc) ((enc)->ruby_encoding_index & ENC_INDEX_MASK) +#define ENC_FROM_ENCINDEX(idx) (RARRAY_PTR(rb_encoding_list)[idx]) +#define ENC_FROM_ENCODING(enc) ENC_FROM_ENCINDEX(ENC_TO_ENCINDEX(enc)) -#define ENC_DUMMY_FLAG FL_USER2 -#define ENC_DUMMY_P(enc) (RBASIC(enc)->flags & ENC_DUMMY_FLAG) -#define ENC_SET_DUMMY(enc) (RBASIC(enc)->flags |= ENC_DUMMY_FLAG) +#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG) +#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG) static inline int rb_enc_dummy_p(rb_encoding *enc) { - if (!enc_initialized_p(enc)) return Qfalse; - return ENC_DUMMY_P(ENC_FROM_ENCODING(enc)); + return ENC_DUMMY_P(enc) != 0; } VALUE rb_str_transcode(VALUE str, VALUE to); diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h index fe016d27e..1784348e1 100644 --- a/include/ruby/oniguruma.h +++ b/include/ruby/oniguruma.h @@ -166,7 +166,6 @@ typedef struct OnigEncodingTypeST { int (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], struct OnigEncodingTypeST* enc); OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, struct OnigEncodingTypeST* enc); int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc); - void *auxiliary_data; int ruby_encoding_index; } OnigEncodingType; -- cgit