diff options
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 1447 |
1 files changed, 993 insertions, 454 deletions
diff --git a/encoding.c b/encoding.c index b8c5f6d357..2737108379 100644 --- a/encoding.c +++ b/encoding.c @@ -9,35 +9,56 @@ **********************************************************************/ -#include "ruby/ruby.h" -#include "ruby/encoding.h" +#include "ruby/internal/config.h" + +#include <ctype.h> + +#include "encindex.h" #include "internal.h" +#include "internal/enc.h" +#include "internal/encoding.h" +#include "internal/inits.h" +#include "internal/load.h" +#include "internal/object.h" +#include "internal/string.h" +#include "internal/vm.h" #include "regenc.h" -#include <ctype.h> -#ifndef NO_LOCALE_CHARMAP -#ifdef __CYGWIN__ -#include <windows.h> -#endif -#ifdef HAVE_LANGINFO_H -#include <langinfo.h> -#endif -#endif +#include "ruby/encoding.h" #include "ruby/util.h" +#include "ruby_assert.h" +#include "vm_sync.h" + +#ifndef ENC_DEBUG +#define ENC_DEBUG 0 +#endif +#define ENC_ASSERT(expr) RUBY_ASSERT_WHEN(ENC_DEBUG, expr) +#define MUST_STRING(str) (ENC_ASSERT(RB_TYPE_P(str, T_STRING)), str) + +#undef rb_ascii8bit_encindex +#undef rb_utf8_encindex +#undef rb_usascii_encindex + +typedef OnigEncodingType rb_raw_encoding; #if defined __GNUC__ && __GNUC__ >= 4 #pragma GCC visibility push(default) int rb_enc_register(const char *name, rb_encoding *encoding); void rb_enc_set_base(const char *name, const char *orig); +int rb_enc_set_dummy(int index); void rb_encdb_declare(const char *name); int rb_encdb_replicate(const char *name, const char *orig); int rb_encdb_dummy(const char *name); int rb_encdb_alias(const char *alias, const char *orig); +void rb_encdb_set_unicode(int index); #pragma GCC visibility pop #endif static ID id_encoding; VALUE rb_cEncoding; -static VALUE rb_encoding_list; + +#define DEFAULT_ENCODING_LIST_CAPA 128 +static VALUE rb_default_encoding_list; +static VALUE rb_additional_encoding_list; struct rb_encoding_entry { const char *name; @@ -45,14 +66,34 @@ struct rb_encoding_entry { rb_encoding *base; }; -static struct { +static struct enc_table { struct rb_encoding_entry *list; int count; int size; st_table *names; -} enc_table; +} global_enc_table; -void rb_enc_init(void); +static rb_encoding *global_enc_ascii, + *global_enc_utf_8, + *global_enc_us_ascii; + +#define GLOBAL_ENC_TABLE_ENTER(enc_table) struct enc_table *enc_table = &global_enc_table; RB_VM_LOCK_ENTER() +#define GLOBAL_ENC_TABLE_LEAVE() RB_VM_LOCK_LEAVE() +#define GLOBAL_ENC_TABLE_EVAL(enc_table, expr) do { \ + GLOBAL_ENC_TABLE_ENTER(enc_table); \ + { \ + expr; \ + } \ + GLOBAL_ENC_TABLE_LEAVE(); \ +} while (0) + + +#define ENC_DUMMY_FLAG (1<<24) +#define ENC_INDEX_MASK (~(~0U<<24)) + +#define ENC_TO_ENCINDEX(enc) (int)((enc)->ruby_encoding_index & ENC_INDEX_MASK) +#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG) +#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG) #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX #define UNSPECIFIED_ENCODING INT_MAX @@ -60,42 +101,87 @@ void rb_enc_init(void); #define ENCODING_NAMELEN_MAX 63 #define valid_encoding_name_p(name) ((name) && strlen(name) <= ENCODING_NAMELEN_MAX) -#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc)) - -static int load_encoding(const char *name); - -static size_t -enc_memsize(const void *p) -{ - return 0; -} - static const rb_data_type_t encoding_data_type = { "encoding", - {0, 0, enc_memsize,}, + {0, 0, 0,}, + 0, 0, RUBY_TYPED_FREE_IMMEDIATELY }; #define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type) +#define is_obj_encoding(obj) (RB_TYPE_P((obj), T_DATA) && is_data_encoding(obj)) + +int +rb_data_is_encoding(VALUE obj) +{ + return is_data_encoding(obj); +} static VALUE enc_new(rb_encoding *encoding) { - return TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, encoding); + VALUE enc = TypedData_Wrap_Struct(rb_cEncoding, &encoding_data_type, (void *)encoding); + rb_obj_freeze(enc); + FL_SET_RAW(enc, RUBY_FL_SHAREABLE); + return enc; +} + +static void +enc_list_update(int index, rb_raw_encoding *encoding) +{ + if (index < DEFAULT_ENCODING_LIST_CAPA) { + VALUE list = rb_default_encoding_list; + if (list && NIL_P(rb_ary_entry(list, index))) { + /* initialize encoding data */ + rb_ary_store(list, index, enc_new(encoding)); + } + } + else { + RB_VM_LOCK_ENTER(); + { + VALUE list = rb_additional_encoding_list; + if (list && NIL_P(rb_ary_entry(list, index))) { + /* initialize encoding data */ + rb_ary_store(list, index - DEFAULT_ENCODING_LIST_CAPA, enc_new(encoding)); + } + } + RB_VM_LOCK_LEAVE(); + } } static VALUE -rb_enc_from_encoding_index(int idx) +enc_list_lookup(int idx) { VALUE list, enc; - if (!(list = rb_encoding_list)) { - rb_bug("rb_enc_from_encoding_index(%d): no rb_encoding_list", idx); + if (idx < DEFAULT_ENCODING_LIST_CAPA) { + if (!(list = rb_default_encoding_list)) { + rb_bug("rb_enc_from_encoding_index(%d): no rb_default_encoding_list", idx); + } + enc = rb_ary_entry(list, idx); + } + else { + RB_VM_LOCK_ENTER(); + { + if (!(list = rb_additional_encoding_list)) { + rb_bug("rb_enc_from_encoding_index(%d): no rb_additional_encoding_list", idx); + } + enc = rb_ary_entry(list, idx - DEFAULT_ENCODING_LIST_CAPA); + } + RB_VM_LOCK_LEAVE(); } - enc = rb_ary_entry(list, idx); + if (NIL_P(enc)) { - rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx); + rb_bug("rb_enc_from_encoding_index(%d): not created yet", idx); + } + else { + return enc; } - return enc; +} + +static VALUE +rb_enc_from_encoding_index(int idx) +{ + return enc_list_lookup(idx); } VALUE @@ -107,7 +193,17 @@ rb_enc_from_encoding(rb_encoding *encoding) return rb_enc_from_encoding_index(idx); } -static int enc_autoload(rb_encoding *); +int +rb_enc_to_index(rb_encoding *enc) +{ + return enc ? ENC_TO_ENCINDEX(enc) : 0; +} + +int +rb_enc_dummy_p(rb_encoding *enc) +{ + return ENC_DUMMY_P(enc) != 0; +} static int check_encoding(rb_encoding *enc) @@ -115,8 +211,8 @@ check_encoding(rb_encoding *enc) int index = rb_enc_to_index(enc); if (rb_enc_from_index(index) != enc) return -1; - if (enc_autoload_p(enc)) { - index = enc_autoload(enc); + if (rb_enc_autoload_p(enc)) { + index = rb_enc_autoload(enc); } return index; } @@ -124,27 +220,54 @@ check_encoding(rb_encoding *enc) static int enc_check_encoding(VALUE obj) { - if (SPECIAL_CONST_P(obj) || !rb_typeddata_is_kind_of(obj, &encoding_data_type)) { + if (!is_obj_encoding(obj)) { return -1; } return check_encoding(RDATA(obj)->data); } -static int +NORETURN(static void not_encoding(VALUE enc)); +static void +not_encoding(VALUE enc) +{ + rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected Encoding)", + rb_obj_class(enc)); +} + +static rb_encoding * must_encoding(VALUE enc) { int index = enc_check_encoding(enc); if (index < 0) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)", - rb_obj_classname(enc)); + not_encoding(enc); } - return index; + return DATA_PTR(enc); +} + +static rb_encoding * +must_encindex(int index) +{ + rb_encoding *enc = rb_enc_from_index(index); + if (!enc) { + rb_raise(rb_eEncodingError, "encoding index out of bound: %d", + index); + } + if (ENC_TO_ENCINDEX(enc) != (int)(index & ENC_INDEX_MASK)) { + rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)", + index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc)); + } + if (rb_enc_autoload_p(enc) && rb_enc_autoload(enc) == -1) { + rb_loaderror("failed to load encoding (%s)", + rb_enc_name(enc)); + } + return enc; } int rb_to_encoding_index(VALUE enc) { int idx; + const char *name; idx = enc_check_encoding(enc); if (idx >= 0) { @@ -156,58 +279,89 @@ rb_to_encoding_index(VALUE enc) if (!rb_enc_asciicompat(rb_enc_get(enc))) { return -1; } - return rb_enc_find_index(StringValueCStr(enc)); + if (!(name = rb_str_to_cstr(enc))) { + return -1; + } + return rb_enc_find_index(name); } -static rb_encoding * -to_encoding(VALUE enc) +static const char * +name_for_encoding(volatile VALUE *enc) { - int idx; + VALUE name = StringValue(*enc); + const char *n; - StringValue(enc); - if (!rb_enc_asciicompat(rb_enc_get(enc))) { - rb_raise(rb_eArgError, "invalid name encoding (non ASCII)"); + if (!rb_enc_asciicompat(rb_enc_get(name))) { + rb_raise(rb_eArgError, "invalid encoding name (non ASCII)"); + } + if (!(n = rb_str_to_cstr(name))) { + rb_raise(rb_eArgError, "invalid encoding name (NUL byte)"); } - idx = rb_enc_find_index(StringValueCStr(enc)); + return n; +} + +/* Returns encoding index or UNSPECIFIED_ENCODING */ +static int +str_find_encindex(VALUE enc) +{ + int idx = rb_enc_find_index(name_for_encoding(&enc)); + RB_GC_GUARD(enc); + return idx; +} + +static int +str_to_encindex(VALUE enc) +{ + int idx = str_find_encindex(enc); if (idx < 0) { - rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc)); + rb_raise(rb_eArgError, "unknown encoding name - %"PRIsVALUE, enc); } - return rb_enc_from_index(idx); + return idx; +} + +static rb_encoding * +str_to_encoding(VALUE enc) +{ + return rb_enc_from_index(str_to_encindex(enc)); } rb_encoding * rb_to_encoding(VALUE enc) { if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data; - return to_encoding(enc); + return str_to_encoding(enc); } -void -rb_gc_mark_encodings(void) +rb_encoding * +rb_find_encoding(VALUE enc) { + int idx; + if (enc_check_encoding(enc) >= 0) return RDATA(enc)->data; + idx = str_find_encindex(enc); + if (idx < 0) return NULL; + return rb_enc_from_index(idx); } static int -enc_table_expand(int newsize) +enc_table_expand(struct enc_table *enc_table, int newsize) { struct rb_encoding_entry *ent; int count = newsize; - if (enc_table.size >= newsize) return newsize; + if (enc_table->size >= newsize) return newsize; newsize = (newsize + 7) / 8 * 8; - ent = realloc(enc_table.list, sizeof(*enc_table.list) * newsize); - if (!ent) return -1; - memset(ent + enc_table.size, 0, sizeof(*ent)*(newsize - enc_table.size)); - enc_table.list = ent; - enc_table.size = newsize; + ent = REALLOC_N(enc_table->list, struct rb_encoding_entry, newsize); + memset(ent + enc_table->size, 0, sizeof(*ent)*(newsize - enc_table->size)); + enc_table->list = ent; + enc_table->size = newsize; return count; } static int -enc_register_at(int index, const char *name, rb_encoding *encoding) +enc_register_at(struct enc_table *enc_table, int index, const char *name, rb_encoding *base_encoding) { - struct rb_encoding_entry *ent = &enc_table.list[index]; - VALUE list; + struct rb_encoding_entry *ent = &enc_table->list[index]; + rb_raw_encoding *encoding; if (!valid_encoding_name_p(name)) return -1; if (!ent->name) { @@ -216,89 +370,135 @@ enc_register_at(int index, const char *name, rb_encoding *encoding) else if (STRCASECMP(name, ent->name)) { return -1; } - if (!ent->enc) { - ent->enc = xmalloc(sizeof(rb_encoding)); + encoding = (rb_raw_encoding *)ent->enc; + if (!encoding) { + encoding = xmalloc(sizeof(rb_encoding)); } - if (encoding) { - *ent->enc = *encoding; + if (base_encoding) { + *encoding = *base_encoding; } else { - memset(ent->enc, 0, sizeof(*ent->enc)); + memset(encoding, 0, sizeof(*ent->enc)); } - encoding = ent->enc; encoding->name = name; encoding->ruby_encoding_index = index; - st_insert(enc_table.names, (st_data_t)name, (st_data_t)index); - list = rb_encoding_list; - if (list && NIL_P(rb_ary_entry(list, index))) { - /* initialize encoding data */ - rb_ary_store(list, index, enc_new(encoding)); - } + ent->enc = encoding; + st_insert(enc_table->names, (st_data_t)name, (st_data_t)index); + + enc_list_update(index, encoding); return index; } static int -enc_register(const char *name, rb_encoding *encoding) +enc_register(struct enc_table *enc_table, const char *name, rb_encoding *encoding) { - int index = enc_table.count; + int index = enc_table->count; - if ((index = enc_table_expand(index + 1)) < 0) return -1; - enc_table.count = index; - return enc_register_at(index - 1, name, encoding); + enc_table->count = enc_table_expand(enc_table, index + 1); + return enc_register_at(enc_table, index, name, encoding); } static void set_encoding_const(const char *, rb_encoding *); -int rb_enc_registered(const char *name); +static int enc_registered(struct enc_table *enc_table, const char *name); + +static rb_encoding * +enc_from_index(struct enc_table *enc_table, int index) +{ + if (UNLIKELY(index < 0 || enc_table->count <= (index &= ENC_INDEX_MASK))) { + return 0; + } + return enc_table->list[index].enc; +} + +rb_encoding * +rb_enc_from_index(int index) +{ + rb_encoding *enc; + + switch (index) { + case ENCINDEX_ASCII: return global_enc_ascii; + case ENCINDEX_UTF_8: return global_enc_utf_8; + case ENCINDEX_US_ASCII: return global_enc_us_ascii; + default: + GLOBAL_ENC_TABLE_EVAL(enc_table, + enc = enc_from_index(enc_table, index)); + return enc; + } +} int rb_enc_register(const char *name, rb_encoding *encoding) { - int index = rb_enc_registered(name); + int index; + + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + index = enc_registered(enc_table, name); + + if (index >= 0) { + rb_encoding *oldenc = enc_from_index(enc_table, index); + if (STRCASECMP(name, rb_enc_name(oldenc))) { + index = enc_register(enc_table, name, encoding); + } + else if (rb_enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) { + enc_register_at(enc_table, index, name, encoding); + } + else { + rb_raise(rb_eArgError, "encoding %s is already registered", name); + } + } + else { + index = enc_register(enc_table, name, encoding); + set_encoding_const(name, rb_enc_from_index(index)); + } + } + GLOBAL_ENC_TABLE_LEAVE(); + return index; +} - if (index >= 0) { - rb_encoding *oldenc = rb_enc_from_index(index); - if (STRCASECMP(name, rb_enc_name(oldenc))) { - index = enc_register(name, encoding); - } - else if (enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) { - enc_register_at(index, name, encoding); - } - else { - rb_raise(rb_eArgError, "encoding %s is already registered", name); - } - } - else { - index = enc_register(name, encoding); - set_encoding_const(name, rb_enc_from_index(index)); +int +enc_registered(struct enc_table *enc_table, const char *name) +{ + st_data_t idx = 0; + + if (!name) return -1; + if (!enc_table->list) return -1; + if (st_lookup(enc_table->names, (st_data_t)name, &idx)) { + return (int)idx; } - return index; + return -1; } void rb_encdb_declare(const char *name) { - int idx = rb_enc_registered(name); - if (idx < 0) { - idx = enc_register(name, 0); + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + int idx = enc_registered(enc_table, name); + if (idx < 0) { + idx = enc_register(enc_table, name, 0); + } + set_encoding_const(name, rb_enc_from_index(idx)); } - set_encoding_const(name, rb_enc_from_index(idx)); + GLOBAL_ENC_TABLE_LEAVE(); } static void -enc_check_duplication(const char *name) +enc_check_duplication(struct enc_table *enc_table, const char *name) { - if (rb_enc_registered(name) >= 0) { + if (enc_registered(enc_table, name) >= 0) { rb_raise(rb_eArgError, "encoding %s is already registered", name); } } static rb_encoding* -set_base_encoding(int index, rb_encoding *base) +set_base_encoding(struct enc_table *enc_table, int index, rb_encoding *base) { - rb_encoding *enc = enc_table.list[index].enc; + rb_encoding *enc = enc_table->list[index].enc; - enc_table.list[index].base = base; - if (rb_enc_dummy_p(base)) ENC_SET_DUMMY(enc); + ASSUME(enc); + enc_table->list[index].base = base; + if (ENC_DUMMY_P(base)) ENC_SET_DUMMY((rb_raw_encoding *)enc); return enc; } @@ -309,23 +509,54 @@ set_base_encoding(int index, rb_encoding *base) void rb_enc_set_base(const char *name, const char *orig) { - int idx = rb_enc_registered(name); - int origidx = rb_enc_registered(orig); - set_base_encoding(idx, rb_enc_from_index(origidx)); + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + int idx = enc_registered(enc_table, name); + int origidx = enc_registered(enc_table, orig); + set_base_encoding(enc_table, idx, rb_enc_from_index(origidx)); + } + GLOBAL_ENC_TABLE_LEAVE(); } +/* for encdb.h + * Set encoding dummy. + */ int -rb_enc_replicate(const char *name, rb_encoding *encoding) +rb_enc_set_dummy(int index) +{ + rb_encoding *enc; + + GLOBAL_ENC_TABLE_EVAL(enc_table, + enc = enc_table->list[index].enc); + + ENC_SET_DUMMY((rb_raw_encoding *)enc); + return index; +} + +static int +enc_replicate(struct enc_table *enc_table, const char *name, rb_encoding *encoding) { int idx; - enc_check_duplication(name); - idx = enc_register(name, encoding); - set_base_encoding(idx, encoding); + enc_check_duplication(enc_table, name); + idx = enc_register(enc_table, name, encoding); + if (idx < 0) rb_raise(rb_eArgError, "invalid encoding name: %s", name); + set_base_encoding(enc_table, idx, encoding); set_encoding_const(name, rb_enc_from_index(idx)); return idx; } +int +rb_enc_replicate(const char *name, rb_encoding *encoding) +{ + int r; + + GLOBAL_ENC_TABLE_EVAL(enc_table, + r = enc_replicate(enc_table, name, encoding)); + + return r; +} + /* * call-seq: * enc.replicate(name) -> encoding @@ -336,59 +567,83 @@ rb_enc_replicate(const char *name, rb_encoding *encoding) * */ static VALUE -enc_replicate(VALUE encoding, VALUE name) +enc_replicate_m(VALUE encoding, VALUE name) { - return rb_enc_from_encoding_index( - rb_enc_replicate(StringValueCStr(name), - rb_to_encoding(encoding))); + int idx = rb_enc_replicate(name_for_encoding(&name), rb_to_encoding(encoding)); + RB_GC_GUARD(name); + return rb_enc_from_encoding_index(idx); } static int -enc_replicate_with_index(const char *name, rb_encoding *origenc, int idx) +enc_replicate_with_index(struct enc_table *enc_table, const char *name, rb_encoding *origenc, int idx) { if (idx < 0) { - idx = enc_register(name, origenc); + idx = enc_register(enc_table, name, origenc); } else { - idx = enc_register_at(idx, name, origenc); + idx = enc_register_at(enc_table, idx, name, origenc); } if (idx >= 0) { - set_base_encoding(idx, origenc); + set_base_encoding(enc_table, idx, origenc); set_encoding_const(name, rb_enc_from_index(idx)); } + else { + rb_raise(rb_eArgError, "failed to replicate encoding"); + } return idx; } int rb_encdb_replicate(const char *name, const char *orig) { - int origidx = rb_enc_registered(orig); - int idx = rb_enc_registered(name); + int r; - if (origidx < 0) { - origidx = enc_register(orig, 0); + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + int origidx = enc_registered(enc_table, orig); + int idx = enc_registered(enc_table, name); + + if (origidx < 0) { + origidx = enc_register(enc_table, orig, 0); + } + r = enc_replicate_with_index(enc_table, name, rb_enc_from_index(origidx), idx); } - return enc_replicate_with_index(name, rb_enc_from_index(origidx), idx); + GLOBAL_ENC_TABLE_LEAVE(); + + return r; } int rb_define_dummy_encoding(const char *name) { - int index = rb_enc_replicate(name, rb_ascii8bit_encoding()); - rb_encoding *enc = enc_table.list[index].enc; + int index; + + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + index = enc_replicate(enc_table, name, rb_ascii8bit_encoding()); + rb_encoding *enc = enc_table->list[index].enc; + ENC_SET_DUMMY((rb_raw_encoding *)enc); + } + GLOBAL_ENC_TABLE_LEAVE(); - ENC_SET_DUMMY(enc); return index; } int rb_encdb_dummy(const char *name) { - int index = enc_replicate_with_index(name, rb_ascii8bit_encoding(), - rb_enc_registered(name)); - rb_encoding *enc = enc_table.list[index].enc; + int index; + + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + index = enc_replicate_with_index(enc_table, name, + rb_ascii8bit_encoding(), + enc_registered(enc_table, name)); + rb_encoding *enc = enc_table->list[index].enc; + ENC_SET_DUMMY((rb_raw_encoding *)enc); + } + GLOBAL_ENC_TABLE_LEAVE(); - ENC_SET_DUMMY(enc); return index; } @@ -408,7 +663,7 @@ rb_encdb_dummy(const char *name) static VALUE enc_dummy_p(VALUE enc) { - return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse; + return RBOOL(ENC_DUMMY_P(must_encoding(enc))); } /* @@ -424,17 +679,22 @@ enc_dummy_p(VALUE enc) static VALUE enc_ascii_compatible_p(VALUE enc) { - return rb_enc_asciicompat(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse; + return RBOOL(rb_enc_asciicompat(must_encoding(enc))); } /* - * Returns 1 when the encoding is Unicode series other than UTF-7 else 0. + * Returns non-zero when the encoding is Unicode series other than UTF-7 else 0. */ int rb_enc_unicode_p(rb_encoding *enc) { - const char *name = rb_enc_name(enc); - return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7'; + return ONIGENC_IS_UNICODE(enc); +} + +static st_data_t +enc_dup_name(st_data_t name) +{ + return (st_data_t)strdup((const char *)name); } /* @@ -442,162 +702,189 @@ rb_enc_unicode_p(rb_encoding *enc) * else returns NULL. */ static int -enc_alias_internal(const char *alias, int idx) +enc_alias_internal(struct enc_table *enc_table, const char *alias, int idx) { - return st_insert2(enc_table.names, (st_data_t)alias, (st_data_t)idx, - (st_data_t(*)(st_data_t))strdup); + return st_insert2(enc_table->names, (st_data_t)alias, (st_data_t)idx, + enc_dup_name); } static int -enc_alias(const char *alias, int idx) +enc_alias(struct enc_table *enc_table, const char *alias, int idx) { if (!valid_encoding_name_p(alias)) return -1; - if (!enc_alias_internal(alias, idx)) - set_encoding_const(alias, rb_enc_from_index(idx)); + if (!enc_alias_internal(enc_table, alias, idx)) + set_encoding_const(alias, enc_from_index(enc_table, idx)); return idx; } int rb_enc_alias(const char *alias, const char *orig) { - int idx; + int idx, r; - enc_check_duplication(alias); - if (!enc_table.list) { - rb_enc_init(); + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + enc_check_duplication(enc_table, alias); + if ((idx = rb_enc_find_index(orig)) < 0) { + r = -1; + } + else { + r = enc_alias(enc_table, alias, idx); + } } - if ((idx = rb_enc_find_index(orig)) < 0) { - return -1; - } - return enc_alias(alias, idx); + GLOBAL_ENC_TABLE_LEAVE(); + + return r; } int rb_encdb_alias(const char *alias, const char *orig) { - int idx = rb_enc_registered(orig); + int r; - if (idx < 0) { - idx = enc_register(orig, 0); - } - return enc_alias(alias, idx); -} + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + int idx = enc_registered(enc_table, orig); -enum { - ENCINDEX_ASCII, - ENCINDEX_UTF_8, - ENCINDEX_US_ASCII, - ENCINDEX_BUILTIN_MAX -}; + if (idx < 0) { + idx = enc_register(enc_table, orig, 0); + } + r = enc_alias(enc_table, alias, idx); + } + GLOBAL_ENC_TABLE_LEAVE(); -extern rb_encoding OnigEncodingUTF_8; -extern rb_encoding OnigEncodingUS_ASCII; + return r; +} void -rb_enc_init(void) +rb_encdb_set_unicode(int index) { - enc_table_expand(ENCODING_COUNT + 1); - if (!enc_table.names) { - enc_table.names = st_init_strcasetable(); + rb_raw_encoding *enc = (rb_raw_encoding *)rb_enc_from_index(index); + ASSUME(enc); + enc->flags |= ONIGENC_FLAG_UNICODE; +} + +static void +rb_enc_init(struct enc_table *enc_table) +{ + enc_table_expand(enc_table, ENCODING_COUNT + 1); + if (!enc_table->names) { + enc_table->names = st_init_strcasetable(); } -#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc) +#define ENC_REGISTER(enc) enc_register_at(enc_table, ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc) ENC_REGISTER(ASCII); ENC_REGISTER(UTF_8); ENC_REGISTER(US_ASCII); + global_enc_ascii = enc_table->list[ENCINDEX_ASCII].enc; + global_enc_utf_8 = enc_table->list[ENCINDEX_UTF_8].enc; + global_enc_us_ascii = enc_table->list[ENCINDEX_US_ASCII].enc; #undef ENC_REGISTER - enc_table.count = ENCINDEX_BUILTIN_MAX; -} +#define ENCDB_REGISTER(name, enc) enc_register_at(enc_table, ENCINDEX_##enc, name, NULL) + ENCDB_REGISTER("UTF-16BE", UTF_16BE); + ENCDB_REGISTER("UTF-16LE", UTF_16LE); + ENCDB_REGISTER("UTF-32BE", UTF_32BE); + ENCDB_REGISTER("UTF-32LE", UTF_32LE); + ENCDB_REGISTER("UTF-16", UTF_16); + ENCDB_REGISTER("UTF-32", UTF_32); + ENCDB_REGISTER("UTF8-MAC", UTF8_MAC); -rb_encoding * -rb_enc_from_index(int index) -{ - if (!enc_table.list) { - rb_enc_init(); - } - if (index < 0 || enc_table.count <= index) { - return 0; - } - return enc_table.list[index].enc; + ENCDB_REGISTER("EUC-JP", EUC_JP); + ENCDB_REGISTER("Windows-31J", Windows_31J); +#undef ENCDB_REGISTER + enc_table->count = ENCINDEX_BUILTIN_MAX; } -int -rb_enc_registered(const char *name) +rb_encoding * +rb_enc_get_from_index(int index) { - st_data_t idx = 0; - - if (!name) return -1; - if (!enc_table.list) return -1; - if (st_lookup(enc_table.names, (st_data_t)name, &idx)) { - return (int)idx; - } - return -1; + return must_encindex(index); } -static VALUE -require_enc(VALUE enclib) -{ - int safe = rb_safe_level(); - return rb_require_safe(enclib, safe > 3 ? 3 : safe); -} +int rb_require_internal_silent(VALUE fname); static int load_encoding(const char *name) { VALUE enclib = rb_sprintf("enc/%s.so", name); - VALUE verbose = ruby_verbose; VALUE debug = ruby_debug; - VALUE loaded; + VALUE errinfo; char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3; + int loaded; int idx; while (s < e) { if (!ISALNUM(*s)) *s = '_'; - else if (ISUPPER(*s)) *s = TOLOWER(*s); + else if (ISUPPER(*s)) *s = (char)TOLOWER(*s); ++s; } - FL_UNSET(enclib, FL_TAINT|FL_UNTRUSTED); - OBJ_FREEZE(enclib); - ruby_verbose = Qfalse; + enclib = rb_fstring(enclib); ruby_debug = Qfalse; - loaded = rb_protect(require_enc, enclib, 0); - ruby_verbose = verbose; + errinfo = rb_errinfo(); + loaded = rb_require_internal_silent(enclib); ruby_debug = debug; - rb_set_errinfo(Qnil); - if (NIL_P(loaded)) return -1; - if ((idx = rb_enc_registered(name)) < 0) return -1; - if (enc_autoload_p(enc_table.list[idx].enc)) return -1; + rb_set_errinfo(errinfo); + + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + if (loaded < 0 || 1 < loaded) { + idx = -1; + } + else if ((idx = enc_registered(enc_table, name)) < 0) { + idx = -1; + } + else if (rb_enc_autoload_p(enc_table->list[idx].enc)) { + idx = -1; + } + } + GLOBAL_ENC_TABLE_LEAVE(); + return idx; } static int -enc_autoload(rb_encoding *enc) +enc_autoload_body(struct enc_table *enc_table, rb_encoding *enc) { - int i; - rb_encoding *base = enc_table.list[ENC_TO_ENCINDEX(enc)].base; + rb_encoding *base = enc_table->list[ENC_TO_ENCINDEX(enc)].base; if (base) { - i = 0; + int i = 0; do { - if (i >= enc_table.count) return -1; - } while (enc_table.list[i].enc != base && (++i, 1)); - if (enc_autoload_p(base)) { - if (enc_autoload(base) < 0) return -1; + if (i >= enc_table->count) return -1; + } while (enc_table->list[i].enc != base && (++i, 1)); + if (rb_enc_autoload_p(base)) { + if (rb_enc_autoload(base) < 0) return -1; } - i = ENC_TO_ENCINDEX(enc); - enc_register_at(i, rb_enc_name(enc), base); + i = enc->ruby_encoding_index; + enc_register_at(enc_table, i & ENC_INDEX_MASK, rb_enc_name(enc), base); + ((rb_raw_encoding *)enc)->ruby_encoding_index = i; + i &= ENC_INDEX_MASK; + return i; } else { - i = load_encoding(rb_enc_name(enc)); + return -2; + } +} + +int +rb_enc_autoload(rb_encoding *enc) +{ + int i; + GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_autoload_body(enc_table, enc)); + if (i == -2) { + i = load_encoding(rb_enc_name(enc)); } return i; } +/* Return encoding index or UNSPECIFIED_ENCODING from encoding name */ int rb_enc_find_index(const char *name) { - int i = rb_enc_registered(name); + int i; rb_encoding *enc; + GLOBAL_ENC_TABLE_EVAL(enc_table, i = enc_registered(enc_table, name)); + if (i < 0) { i = load_encoding(name); } @@ -606,8 +893,8 @@ rb_enc_find_index(const char *name) rb_raise(rb_eArgError, "encoding %s is not registered", name); } } - else if (enc_autoload_p(enc)) { - if (enc_autoload(enc) < 0) { + else if (rb_enc_autoload_p(enc)) { + if (rb_enc_autoload(enc) < 0) { rb_warn("failed to load encoding (%s); use ASCII-8BIT instead", name); return 0; @@ -616,6 +903,17 @@ rb_enc_find_index(const char *name) return i; } +int +rb_enc_find_index2(const char *name, long len) +{ + char buf[ENCODING_NAMELEN_MAX+1]; + + if (len > ENCODING_NAMELEN_MAX) return -1; + memcpy(buf, name, len); + buf[len] = '\0'; + return rb_enc_find_index(buf); +} + rb_encoding * rb_enc_find(const char *name) { @@ -632,6 +930,7 @@ enc_capable(VALUE obj) case T_STRING: case T_REGEXP: case T_FILE: + case T_SYMBOL: return TRUE; case T_DATA: if (is_data_encoding(obj)) return TRUE; @@ -640,6 +939,12 @@ enc_capable(VALUE obj) } } +int +rb_enc_capable(VALUE obj) +{ + return enc_capable(obj); +} + ID rb_id_encoding(void) { @@ -647,6 +952,29 @@ rb_id_encoding(void) return id_encoding; } +static int +enc_get_index_str(VALUE str) +{ + int i = ENCODING_GET_INLINED(str); + if (i == ENCODING_INLINE_MAX) { + VALUE iv; + +#if 0 + iv = rb_ivar_get(str, rb_id_encoding()); + i = NUM2INT(iv); +#else + /* + * Tentatively, assume ASCII-8BIT, if encoding index instance + * variable is not found. This can happen when freeing after + * all instance variables are removed in `obj_free`. + */ + iv = rb_attr_get(str, rb_id_encoding()); + i = NIL_P(iv) ? ENCINDEX_ASCII : NUM2INT(iv); +#endif + } + return i; +} + int rb_enc_get_index(VALUE obj) { @@ -655,33 +983,29 @@ rb_enc_get_index(VALUE obj) if (SPECIAL_CONST_P(obj)) { if (!SYMBOL_P(obj)) return -1; - obj = rb_id2str(SYM2ID(obj)); + obj = rb_sym2str(obj); } switch (BUILTIN_TYPE(obj)) { - as_default: - default: case T_STRING: + case T_SYMBOL: case T_REGEXP: - i = ENCODING_GET_INLINED(obj); - if (i == ENCODING_INLINE_MAX) { - VALUE iv; - - iv = rb_ivar_get(obj, rb_id_encoding()); - i = NUM2INT(iv); - } + i = enc_get_index_str(obj); break; case T_FILE: - tmp = rb_funcall(obj, rb_intern("internal_encoding"), 0, 0); - if (NIL_P(tmp)) obj = rb_funcall(obj, rb_intern("external_encoding"), 0, 0); - else obj = tmp; - if (NIL_P(obj)) break; + tmp = rb_funcallv(obj, rb_intern("internal_encoding"), 0, 0); + if (NIL_P(tmp)) { + tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0); + } + if (is_obj_encoding(tmp)) { + i = enc_check_encoding(tmp); + } + break; case T_DATA: if (is_data_encoding(obj)) { i = enc_check_encoding(obj); } - else { - goto as_default; - } + break; + default: break; } return i; @@ -690,6 +1014,10 @@ rb_enc_get_index(VALUE obj) static void enc_set_index(VALUE obj, int idx) { + if (!enc_capable(obj)) { + rb_raise(rb_eArgError, "cannot set encoding on non-encoding capable object"); + } + if (idx < ENCODING_INLINE_MAX) { ENCODING_SET_INLINED(obj, idx); return; @@ -702,23 +1030,34 @@ void rb_enc_set_index(VALUE obj, int idx) { rb_check_frozen(obj); + must_encindex(idx); enc_set_index(obj, idx); } VALUE rb_enc_associate_index(VALUE obj, int idx) { + rb_encoding *enc; + int oldidx, oldtermlen, termlen; + /* enc_check_capable(obj);*/ rb_check_frozen(obj); - if (rb_enc_get_index(obj) == idx) + oldidx = rb_enc_get_index(obj); + if (oldidx == idx) return obj; if (SPECIAL_CONST_P(obj)) { rb_raise(rb_eArgError, "cannot set encoding"); } + enc = must_encindex(idx); if (!ENC_CODERANGE_ASCIIONLY(obj) || - !rb_enc_asciicompat(rb_enc_from_index(idx))) { + !rb_enc_asciicompat(enc)) { ENC_CODERANGE_CLEAR(obj); } + termlen = rb_enc_mbminlen(enc); + oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx)); + if (oldtermlen != termlen && RB_TYPE_P(obj, T_STRING)) { + rb_str_change_terminator_length(obj, oldtermlen, termlen); + } enc_set_index(obj, idx); return obj; } @@ -735,10 +1074,9 @@ rb_enc_get(VALUE obj) return rb_enc_from_index(rb_enc_get_index(obj)); } -rb_encoding* -rb_enc_check(VALUE str1, VALUE str2) +static rb_encoding* +rb_encoding_check(rb_encoding* enc, VALUE str1, VALUE str2) { - rb_encoding *enc = rb_enc_compatible(str1, str2); if (!enc) rb_raise(rb_eEncCompatError, "incompatible character encodings: %s and %s", rb_enc_name(rb_enc_get(str1)), @@ -746,30 +1084,34 @@ rb_enc_check(VALUE str1, VALUE str2) return enc; } +static rb_encoding* enc_compatible_str(VALUE str1, VALUE str2); + rb_encoding* -rb_enc_compatible(VALUE str1, VALUE str2) +rb_enc_check_str(VALUE str1, VALUE str2) { - int idx1, idx2; - rb_encoding *enc1, *enc2; - int isstr1, isstr2; - - idx1 = rb_enc_get_index(str1); - idx2 = rb_enc_get_index(str2); + rb_encoding *enc = enc_compatible_str(MUST_STRING(str1), MUST_STRING(str2)); + return rb_encoding_check(enc, str1, str2); +} - if (idx1 < 0 || idx2 < 0) - return 0; +rb_encoding* +rb_enc_check(VALUE str1, VALUE str2) +{ + rb_encoding *enc = rb_enc_compatible(str1, str2); + return rb_encoding_check(enc, str1, str2); +} - if (idx1 == idx2) { - return rb_enc_from_index(idx1); - } - enc1 = rb_enc_from_index(idx1); - enc2 = rb_enc_from_index(idx2); +static rb_encoding* +enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2) +{ + int isstr1, isstr2; + rb_encoding *enc1 = rb_enc_from_index(idx1); + rb_encoding *enc2 = rb_enc_from_index(idx2); isstr2 = RB_TYPE_P(str2, T_STRING); if (isstr2 && RSTRING_LEN(str2) == 0) return enc1; isstr1 = RB_TYPE_P(str1, T_STRING); - if (isstr1 && RSTRING_LEN(str1) == 0) + if (isstr1 && isstr2 && RSTRING_LEN(str1) == 0) return (rb_enc_asciicompat(enc1) && rb_enc_str_asciionly_p(str2)) ? enc1 : enc2; if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) { return 0; @@ -813,6 +1155,39 @@ rb_enc_compatible(VALUE str1, VALUE str2) return 0; } +static rb_encoding* +enc_compatible_str(VALUE str1, VALUE str2) +{ + int idx1 = enc_get_index_str(str1); + int idx2 = enc_get_index_str(str2); + + if (idx1 < 0 || idx2 < 0) + return 0; + + if (idx1 == idx2) { + return rb_enc_from_index(idx1); + } + else { + return enc_compatible_latter(str1, str2, idx1, idx2); + } +} + +rb_encoding* +rb_enc_compatible(VALUE str1, VALUE str2) +{ + int idx1 = rb_enc_get_index(str1); + int idx2 = rb_enc_get_index(str2); + + if (idx1 < 0 || idx2 < 0) + return 0; + + if (idx1 == idx2) { + return rb_enc_from_index(idx1); + } + + return enc_compatible_latter(str1, str2, idx1, idx2); +} + void rb_enc_copy(VALUE obj1, VALUE obj2) { @@ -830,11 +1205,11 @@ rb_enc_copy(VALUE obj1, VALUE obj2) VALUE rb_obj_encoding(VALUE obj) { - rb_encoding *enc = rb_enc_get(obj); - if (!enc) { + int idx = rb_enc_get_index(obj); + if (idx < 0) { rb_raise(rb_eTypeError, "unknown encoding"); } - return rb_enc_from_encoding(enc); + return rb_enc_from_encoding_index(idx & ENC_INDEX_MASK); } int @@ -870,7 +1245,8 @@ rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc) int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc) { - unsigned int c, l; + unsigned int c; + int l; if (e <= p) return -1; if (rb_enc_asciicompat(enc)) { @@ -897,19 +1273,11 @@ rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc) if (e <= p) rb_raise(rb_eArgError, "empty string"); r = rb_enc_precise_mbclen(p, e, enc); - if (MBCLEN_CHARFOUND_P(r)) { - if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r); - return rb_enc_mbc_to_codepoint(p, e, enc); - } - else + if (!MBCLEN_CHARFOUND_P(r)) { rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc)); -} - -#undef rb_enc_codepoint -unsigned int -rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc) -{ - return rb_enc_codepoint_len(p, e, 0, enc); + } + if (len_p) *len_p = MBCLEN_CHARFOUND_LEN(r); + return rb_enc_mbc_to_codepoint(p, e, enc); } int @@ -946,16 +1314,25 @@ rb_enc_tolower(int c, rb_encoding *enc) static VALUE enc_inspect(VALUE self) { - VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self), - rb_enc_name((rb_encoding*)DATA_PTR(self)), - (enc_dummy_p(self) ? " (dummy)" : "")); - ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT); - return str; + rb_encoding *enc; + + if (!is_data_encoding(self)) { + not_encoding(self); + } + if (!(enc = DATA_PTR(self)) || rb_enc_from_index(rb_enc_to_index(enc)) != enc) { + rb_raise(rb_eTypeError, "broken Encoding"); + } + return rb_enc_sprintf(rb_usascii_encoding(), + "#<%"PRIsVALUE":%s%s%s>", rb_obj_class(self), + rb_enc_name(enc), + (ENC_DUMMY_P(enc) ? " (dummy)" : ""), + rb_enc_autoload_p(enc) ? " (autoload)" : ""); } /* * call-seq: * enc.name -> string + * enc.to_s -> string * * Returns the name of the encoding. * @@ -964,7 +1341,7 @@ enc_inspect(VALUE self) static VALUE enc_name(VALUE self) { - return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self))); + return rb_fstring_cstr(rb_enc_name((rb_encoding*)DATA_PTR(self))); } static int @@ -973,8 +1350,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args) VALUE *arg = (VALUE *)args; if ((int)idx == (int)arg[0]) { - VALUE str = rb_usascii_str_new2((char *)name); - OBJ_FREEZE(str); + VALUE str = rb_fstring_cstr((char *)name); rb_ary_push(arg[1], str); } return ST_CONTINUE; @@ -986,7 +1362,7 @@ enc_names_i(st_data_t name, st_data_t idx, st_data_t args) * * Returns the list of name and aliases of the encoding. * - * Encoding::WINDOWS_31J.names #=> ["Windows-31J", "CP932", "csWindows31J"] + * Encoding::WINDOWS_31J.names #=> ["Windows-31J", "CP932", "csWindows31J", "SJIS", "PCK"] */ static VALUE enc_names(VALUE self) @@ -995,7 +1371,10 @@ enc_names(VALUE self) args[0] = (VALUE)rb_to_encoding_index(self); args[1] = rb_ary_new2(0); - st_foreach(enc_table.names, enc_names_i, (st_data_t)args); + + GLOBAL_ENC_TABLE_EVAL(enc_table, + st_foreach(enc_table->names, enc_names_i, (st_data_t)args)); + return args[1]; } @@ -1021,20 +1400,25 @@ static VALUE enc_list(VALUE klass) { VALUE ary = rb_ary_new2(0); - rb_ary_replace(ary, rb_encoding_list); + + RB_VM_LOCK_ENTER(); + { + rb_ary_replace(ary, rb_default_encoding_list); + rb_ary_concat(ary, rb_additional_encoding_list); + } + RB_VM_LOCK_LEAVE(); + return ary; } /* * call-seq: * Encoding.find(string) -> enc - * Encoding.find(symbol) -> enc * * Search the encoding with specified <i>name</i>. - * <i>name</i> should be a string or symbol. + * <i>name</i> should be a string. * * Encoding.find("US-ASCII") #=> #<Encoding:US-ASCII> - * Encoding.find(:Shift_JIS) #=> #<Encoding:Shift_JIS> * * Names which this method accept are encoding names and aliases * including following special aliases @@ -1052,7 +1436,12 @@ enc_list(VALUE klass) static VALUE enc_find(VALUE klass, VALUE enc) { - return rb_enc_from_encoding(rb_to_encoding(enc)); + int idx; + if (is_obj_encoding(enc)) + return enc; + idx = str_to_encindex(enc); + if (idx == UNSPECIFIED_ENCODING) return Qnil; + return rb_enc_from_encoding_index(idx); } /* @@ -1091,11 +1480,20 @@ enc_compatible_p(VALUE klass, VALUE str1, VALUE str2) return rb_enc_from_encoding(enc); } +NORETURN(static VALUE enc_s_alloc(VALUE klass)); +/* :nodoc: */ +static VALUE +enc_s_alloc(VALUE klass) +{ + rb_undefined_alloc(klass); + UNREACHABLE_RETURN(Qnil); +} + /* :nodoc: */ static VALUE enc_dump(int argc, VALUE *argv, VALUE self) { - rb_scan_args(argc, argv, "01", 0); + rb_check_arity(argc, 0, 1); return enc_name(self); } @@ -1103,16 +1501,20 @@ enc_dump(int argc, VALUE *argv, VALUE self) static VALUE enc_load(VALUE klass, VALUE str) { + return str; +} + +/* :nodoc: */ +static VALUE +enc_m_loader(VALUE klass, VALUE str) +{ return enc_find(klass, str); } rb_encoding * rb_ascii8bit_encoding(void) { - if (!enc_table.list) { - rb_enc_init(); - } - return enc_table.list[ENCINDEX_ASCII].enc; + return global_enc_ascii; } int @@ -1124,10 +1526,7 @@ rb_ascii8bit_encindex(void) rb_encoding * rb_utf8_encoding(void) { - if (!enc_table.list) { - rb_enc_init(); - } - return enc_table.list[ENCINDEX_UTF_8].enc; + return global_enc_utf_8; } int @@ -1139,10 +1538,7 @@ rb_utf8_encindex(void) rb_encoding * rb_usascii_encoding(void) { - if (!enc_table.list) { - rb_enc_init(); - } - return enc_table.list[ENCINDEX_US_ASCII].enc; + return global_enc_us_ascii; } int @@ -1151,18 +1547,24 @@ rb_usascii_encindex(void) return ENCINDEX_US_ASCII; } +int rb_locale_charmap_index(void); + int rb_locale_encindex(void) { - VALUE charmap = rb_locale_charmap(rb_cEncoding); - int idx; + int idx = rb_locale_charmap_index(); - if (NIL_P(charmap)) - idx = rb_usascii_encindex(); - else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0) - idx = rb_ascii8bit_encindex(); + if (idx < 0) idx = ENCINDEX_UTF_8; - if (rb_enc_registered("locale") < 0) enc_alias_internal("locale", idx); + GLOBAL_ENC_TABLE_ENTER(enc_table); + if (enc_registered(enc_table, "locale") < 0) { +# if defined _WIN32 + void Init_w32_codepage(void); + Init_w32_codepage(); +# endif + enc_alias_internal(enc_table, "locale", idx); + } + GLOBAL_ENC_TABLE_LEAVE(); return idx; } @@ -1173,31 +1575,16 @@ rb_locale_encoding(void) return rb_enc_from_index(rb_locale_encindex()); } -static int -enc_set_filesystem_encoding(void) +int +rb_filesystem_encindex(void) { int idx; -#if defined NO_LOCALE_CHARMAP - idx = rb_enc_to_index(rb_default_external_encoding()); -#elif defined _WIN32 || defined __CYGWIN__ - char cp[sizeof(int) * 8 / 3 + 4]; - snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP()); - idx = rb_enc_find_index(cp); - if (idx < 0) idx = rb_ascii8bit_encindex(); -#else - idx = rb_enc_to_index(rb_default_external_encoding()); -#endif - enc_alias_internal("filesystem", idx); - return idx; -} + GLOBAL_ENC_TABLE_EVAL(enc_table, + idx = enc_registered(enc_table, "filesystem")); -int -rb_filesystem_encindex(void) -{ - int idx = rb_enc_registered("filesystem"); if (idx < 0) - idx = rb_ascii8bit_encindex(); + idx = ENCINDEX_ASCII; return idx; } @@ -1223,20 +1610,25 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha /* Already set */ overridden = TRUE; - if (NIL_P(encoding)) { - def->index = -1; - def->enc = 0; - st_insert(enc_table.names, (st_data_t)strdup(name), - (st_data_t)UNSPECIFIED_ENCODING); - } - else { - def->index = rb_enc_to_index(rb_to_encoding(encoding)); - def->enc = 0; - enc_alias_internal(name, def->index); - } - - if (def == &default_external) - enc_set_filesystem_encoding(); + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + if (NIL_P(encoding)) { + def->index = -1; + def->enc = 0; + st_insert(enc_table->names, (st_data_t)strdup(name), + (st_data_t)UNSPECIFIED_ENCODING); + } + else { + def->index = rb_enc_to_index(rb_to_encoding(encoding)); + def->enc = 0; + enc_alias_internal(enc_table, name, def->index); + } + + if (def == &default_external) { + enc_alias_internal(enc_table, "filesystem", Init_enc_set_filesystem_encoding()); + } + } + GLOBAL_ENC_TABLE_LEAVE(); return overridden; } @@ -1283,9 +1675,11 @@ rb_enc_default_external(void) * encoding may not be valid. Be sure to check String#valid_encoding?. * * File data written to disk will be transcoded to the default external - * encoding when written. + * encoding when written, if default_internal is not nil. * - * The default external encoding is initialized by the locale or -E option. + * The default external encoding is initialized by the -E option. + * If -E isn't set, it is initialized to UTF-8 on Windows and the locale on + * other operating systems. */ static VALUE get_default_external(VALUE klass) @@ -1309,7 +1703,7 @@ rb_enc_set_default_external(VALUE encoding) * * Sets default external encoding. You should not set * Encoding::default_external in ruby code as strings created before changing - * the value may have a different encoding from strings created after thevalue + * the value may have a different encoding from strings created after the value * was changed., instead you should use <tt>ruby -E</tt> to invoke ruby with * the correct default_external. * @@ -1356,22 +1750,19 @@ rb_enc_default_internal(void) * * File names from Dir * * Integer#chr * * String#inspect and Regexp#inspect - * * Strings returned from Curses * * Strings returned from Readline * * Strings returned from SDBM * * Time#zone * * Values from ENV * * Values in ARGV including $PROGRAM_NAME - * * __FILE__ * * Additionally String#encode and String#encode! use the default internal * encoding if no encoding is given. * - * The locale encoding (__ENCODING__), not default_internal, is used as the + * The script encoding (__ENCODING__), not default_internal, is used as the * encoding of created strings. * - * Encoding::default_internal is initialized by the source file's - * internal_encoding or -E option. + * Encoding::default_internal is initialized with -E option or nil otherwise. */ static VALUE get_default_internal(VALUE klass) @@ -1407,56 +1798,6 @@ set_default_internal(VALUE klass, VALUE encoding) return encoding; } -/* - * call-seq: - * Encoding.locale_charmap -> string - * - * Returns the locale charmap name. - * It returns nil if no appropriate information. - * - * Debian GNU/Linux - * LANG=C - * Encoding.locale_charmap #=> "ANSI_X3.4-1968" - * LANG=ja_JP.EUC-JP - * Encoding.locale_charmap #=> "EUC-JP" - * - * SunOS 5 - * LANG=C - * Encoding.locale_charmap #=> "646" - * LANG=ja - * Encoding.locale_charmap #=> "eucJP" - * - * The result is highly platform dependent. - * So Encoding.find(Encoding.locale_charmap) may cause an error. - * If you need some encoding object even for unknown locale, - * Encoding.find("locale") can be used. - * - */ -VALUE -rb_locale_charmap(VALUE klass) -{ -#if defined NO_LOCALE_CHARMAP - return rb_usascii_str_new2("ASCII-8BIT"); -#elif defined _WIN32 || defined __CYGWIN__ - const char *nl_langinfo_codeset(void); - const char *codeset = nl_langinfo_codeset(); - char cp[sizeof(int) * 3 + 4]; - if (!codeset) { - UINT codepage = GetConsoleCP(); - if(!codepage) codepage = GetACP(); - snprintf(cp, sizeof(cp), "CP%d", codepage); - codeset = cp; - } - return rb_usascii_str_new2(codeset); -#elif defined HAVE_LANGINFO_H - char *codeset; - codeset = nl_langinfo(CODESET); - return rb_usascii_str_new2(codeset); -#else - return Qnil; -#endif -} - static void set_encoding_const(const char *name, rb_encoding *enc) { @@ -1512,8 +1853,7 @@ static int rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg) { VALUE ary = (VALUE)arg; - VALUE str = rb_usascii_str_new2((char *)name); - OBJ_FREEZE(str); + VALUE str = rb_fstring_cstr((char *)name); rb_ary_push(ary, str); return ST_CONTINUE; } @@ -1535,8 +1875,15 @@ rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg) static VALUE rb_enc_name_list(VALUE klass) { - VALUE ary = rb_ary_new2(enc_table.names->num_entries); - st_foreach(enc_table.names, rb_enc_name_list_i, (st_data_t)ary); + VALUE ary; + + GLOBAL_ENC_TABLE_ENTER(enc_table); + { + ary = rb_ary_new2(enc_table->names->num_entries); + st_foreach(enc_table->names, rb_enc_name_list_i, (st_data_t)ary); + } + GLOBAL_ENC_TABLE_LEAVE(); + return ary; } @@ -1555,12 +1902,10 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg) if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) { return ST_CONTINUE; } - str = rb_usascii_str_new2(rb_enc_name(enc)); - OBJ_FREEZE(str); + str = rb_fstring_cstr(rb_enc_name(enc)); rb_ary_store(ary, idx, str); } - key = rb_usascii_str_new2((char *)name); - OBJ_FREEZE(key); + key = rb_fstring_cstr((char *)name); rb_hash_aset(aliases, key, str); return ST_CONTINUE; } @@ -1572,8 +1917,8 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg) * Returns the hash of available encoding alias and original encoding name. * * Encoding.aliases - * #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII", - * "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"} + * #=> {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1968"=>"US-ASCII", + * "SJIS"=>"Windows-31J", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"} * */ @@ -1583,20 +1928,222 @@ rb_enc_aliases(VALUE klass) VALUE aliases[2]; aliases[0] = rb_hash_new(); aliases[1] = rb_ary_new(); - st_foreach(enc_table.names, rb_enc_aliases_enc_i, (st_data_t)aliases); + + GLOBAL_ENC_TABLE_EVAL(enc_table, + st_foreach(enc_table->names, rb_enc_aliases_enc_i, (st_data_t)aliases)); + return aliases[0]; } +/* + * An Encoding instance represents a character encoding usable in Ruby. It is + * defined as a constant under the Encoding namespace. It has a name and + * optionally, aliases: + * + * Encoding::ISO_8859_1.name + * #=> "ISO-8859-1" + * + * Encoding::ISO_8859_1.names + * #=> ["ISO-8859-1", "ISO8859-1"] + * + * Ruby methods dealing with encodings return or accept Encoding instances as + * arguments (when a method accepts an Encoding instance as an argument, it + * can be passed an Encoding name or alias instead). + * + * "some string".encoding + * #=> #<Encoding:UTF-8> + * + * string = "some string".encode(Encoding::ISO_8859_1) + * #=> "some string" + * string.encoding + * #=> #<Encoding:ISO-8859-1> + * + * "some string".encode "ISO-8859-1" + * #=> "some string" + * + * Encoding::ASCII_8BIT is a special encoding that is usually used for + * a byte string, not a character string. But as the name insists, its + * characters in the range of ASCII are considered as ASCII + * characters. This is useful when you use ASCII-8BIT characters with + * other ASCII compatible characters. + * + * == Changing an encoding + * + * The associated Encoding of a String can be changed in two different ways. + * + * First, it is possible to set the Encoding of a string to a new Encoding + * without changing the internal byte representation of the string, with + * String#force_encoding. This is how you can tell Ruby the correct encoding + * of a string. + * + * string + * #=> "R\xC3\xA9sum\xC3\xA9" + * string.encoding + * #=> #<Encoding:ISO-8859-1> + * string.force_encoding(Encoding::UTF_8) + * #=> "R\u00E9sum\u00E9" + * + * Second, it is possible to transcode a string, i.e. translate its internal + * byte representation to another encoding. Its associated encoding is also + * set to the other encoding. See String#encode for the various forms of + * transcoding, and the Encoding::Converter class for additional control over + * the transcoding process. + * + * string + * #=> "R\u00E9sum\u00E9" + * string.encoding + * #=> #<Encoding:UTF-8> + * string = string.encode!(Encoding::ISO_8859_1) + * #=> "R\xE9sum\xE9" + * string.encoding + * #=> #<Encoding::ISO-8859-1> + * + * == Script encoding + * + * All Ruby script code has an associated Encoding which any String literal + * created in the source code will be associated to. + * + * The default script encoding is Encoding::UTF_8 after v2.0, but it + * can be changed by a magic comment on the first line of the source + * code file (or second line, if there is a shebang line on the + * first). The comment must contain the word <code>coding</code> or + * <code>encoding</code>, followed by a colon, space and the Encoding + * name or alias: + * + * # encoding: UTF-8 + * + * "some string".encoding + * #=> #<Encoding:UTF-8> + * + * The <code>__ENCODING__</code> keyword returns the script encoding of the file + * which the keyword is written: + * + * # encoding: ISO-8859-1 + * + * __ENCODING__ + * #=> #<Encoding:ISO-8859-1> + * + * <code>ruby -K</code> will change the default locale encoding, but this is + * not recommended. Ruby source files should declare its script encoding by a + * magic comment even when they only depend on US-ASCII strings or regular + * expressions. + * + * == Locale encoding + * + * The default encoding of the environment. Usually derived from locale. + * + * see Encoding.locale_charmap, Encoding.find('locale') + * + * == Filesystem encoding + * + * The default encoding of strings from the filesystem of the environment. + * This is used for strings of file names or paths. + * + * see Encoding.find('filesystem') + * + * == External encoding + * + * Each IO object has an external encoding which indicates the encoding that + * Ruby will use to read its data. By default Ruby sets the external encoding + * of an IO object to the default external encoding. The default external + * encoding is set by locale encoding or the interpreter <code>-E</code> option. + * Encoding.default_external returns the current value of the external + * encoding. + * + * ENV["LANG"] + * #=> "UTF-8" + * Encoding.default_external + * #=> #<Encoding:UTF-8> + * + * $ ruby -E ISO-8859-1 -e "p Encoding.default_external" + * #<Encoding:ISO-8859-1> + * + * $ LANG=C ruby -e 'p Encoding.default_external' + * #<Encoding:US-ASCII> + * + * The default external encoding may also be set through + * Encoding.default_external=, but you should not do this as strings created + * before and after the change will have inconsistent encodings. Instead use + * <code>ruby -E</code> to invoke ruby with the correct external encoding. + * + * When you know that the actual encoding of the data of an IO object is not + * the default external encoding, you can reset its external encoding with + * IO#set_encoding or set it at IO object creation (see IO.new options). + * + * == Internal encoding + * + * To process the data of an IO object which has an encoding different + * from its external encoding, you can set its internal encoding. Ruby will use + * this internal encoding to transcode the data when it is read from the IO + * object. + * + * Conversely, when data is written to the IO object it is transcoded from the + * internal encoding to the external encoding of the IO object. + * + * The internal encoding of an IO object can be set with + * IO#set_encoding or at IO object creation (see IO.new options). + * + * The internal encoding is optional and when not set, the Ruby default + * internal encoding is used. If not explicitly set this default internal + * encoding is +nil+ meaning that by default, no transcoding occurs. + * + * The default internal encoding can be set with the interpreter option + * <code>-E</code>. Encoding.default_internal returns the current internal + * encoding. + * + * $ ruby -e 'p Encoding.default_internal' + * nil + * + * $ ruby -E ISO-8859-1:UTF-8 -e "p [Encoding.default_external, \ + * Encoding.default_internal]" + * [#<Encoding:ISO-8859-1>, #<Encoding:UTF-8>] + * + * The default internal encoding may also be set through + * Encoding.default_internal=, but you should not do this as strings created + * before and after the change will have inconsistent encodings. Instead use + * <code>ruby -E</code> to invoke ruby with the correct internal encoding. + * + * == IO encoding example + * + * In the following example a UTF-8 encoded string "R\u00E9sum\u00E9" is transcoded for + * output to ISO-8859-1 encoding, then read back in and transcoded to UTF-8: + * + * string = "R\u00E9sum\u00E9" + * + * open("transcoded.txt", "w:ISO-8859-1") do |io| + * io.write(string) + * end + * + * puts "raw text:" + * p File.binread("transcoded.txt") + * puts + * + * open("transcoded.txt", "r:ISO-8859-1:UTF-8") do |io| + * puts "transcoded text:" + * p io.read + * end + * + * While writing the file, the internal encoding is not specified as it is + * only necessary for reading. While reading the file both the internal and + * external encoding must be specified to obtain the correct result. + * + * $ ruby t.rb + * raw text: + * "R\xE9sum\xE9" + * + * transcoded text: + * "R\u00E9sum\u00E9" + * + */ + void Init_Encoding(void) { -#undef rb_intern -#define rb_intern(str) rb_intern_const(str) VALUE list; int i; rb_cEncoding = rb_define_class("Encoding", rb_cObject); - rb_undef_alloc_func(rb_cEncoding); + rb_define_alloc_func(rb_cEncoding, enc_s_alloc); rb_undef_method(CLASS_OF(rb_cEncoding), "new"); rb_define_method(rb_cEncoding, "to_s", enc_name, 0); rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0); @@ -1604,7 +2151,7 @@ Init_Encoding(void) rb_define_method(rb_cEncoding, "names", enc_names, 0); rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0); rb_define_method(rb_cEncoding, "ascii_compatible?", enc_ascii_compatible_p, 0); - rb_define_method(rb_cEncoding, "replicate", enc_replicate, 1); + rb_define_method(rb_cEncoding, "replicate", enc_replicate_m, 1); rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0); rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0); rb_define_singleton_method(rb_cEncoding, "aliases", rb_enc_aliases, 0); @@ -1618,45 +2165,37 @@ Init_Encoding(void) rb_define_singleton_method(rb_cEncoding, "default_external=", set_default_external, 1); rb_define_singleton_method(rb_cEncoding, "default_internal", get_default_internal, 0); rb_define_singleton_method(rb_cEncoding, "default_internal=", set_default_internal, 1); - rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); + rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); /* in localeinit.c */ + + struct enc_table *enc_table = &global_enc_table; + + if (DEFAULT_ENCODING_LIST_CAPA < enc_table->count) rb_bug("DEFAULT_ENCODING_LIST_CAPA is too small"); - list = rb_ary_new2(enc_table.count); - RBASIC(list)->klass = 0; - rb_encoding_list = list; + list = rb_additional_encoding_list = rb_ary_new(); + RBASIC_CLEAR_CLASS(list); rb_gc_register_mark_object(list); - for (i = 0; i < enc_table.count; ++i) { - rb_ary_push(list, enc_new(enc_table.list[i].enc)); - } -} + list = rb_default_encoding_list = rb_ary_new2(DEFAULT_ENCODING_LIST_CAPA); + RBASIC_CLEAR_CLASS(list); + rb_gc_register_mark_object(list); -/* locale insensitive ctype functions */ + for (i = 0; i < enc_table->count; ++i) { + rb_ary_push(list, enc_new(enc_table->list[i].enc)); + } -#define ctype_test(c, ctype) \ - (rb_isascii(c) && ONIGENC_IS_ASCII_CODE_CTYPE((c), (ctype))) - -int rb_isalnum(int c) { return ctype_test(c, ONIGENC_CTYPE_ALNUM); } -int rb_isalpha(int c) { return ctype_test(c, ONIGENC_CTYPE_ALPHA); } -int rb_isblank(int c) { return ctype_test(c, ONIGENC_CTYPE_BLANK); } -int rb_iscntrl(int c) { return ctype_test(c, ONIGENC_CTYPE_CNTRL); } -int rb_isdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_DIGIT); } -int rb_isgraph(int c) { return ctype_test(c, ONIGENC_CTYPE_GRAPH); } -int rb_islower(int c) { return ctype_test(c, ONIGENC_CTYPE_LOWER); } -int rb_isprint(int c) { return ctype_test(c, ONIGENC_CTYPE_PRINT); } -int rb_ispunct(int c) { return ctype_test(c, ONIGENC_CTYPE_PUNCT); } -int rb_isspace(int c) { return ctype_test(c, ONIGENC_CTYPE_SPACE); } -int rb_isupper(int c) { return ctype_test(c, ONIGENC_CTYPE_UPPER); } -int rb_isxdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_XDIGIT); } + rb_marshal_define_compat(rb_cEncoding, Qnil, 0, enc_m_loader); +} -int -rb_tolower(int c) +void +Init_encodings(void) { - return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_LOWER_CASE(c) : c; + rb_enc_init(&global_enc_table); } -int -rb_toupper(int c) +/* locale insensitive ctype functions */ + +void +rb_enc_foreach_name(int (*func)(st_data_t name, st_data_t idx, st_data_t arg), st_data_t arg) { - return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_UPPER_CASE(c) : c; + GLOBAL_ENC_TABLE_EVAL(enc_table, st_foreach(enc_table->names, func, arg)); } - |