summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-12 16:03:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-12 16:03:51 +0000
commit5b9739a832c884f450e04d90edb026a09da5e6de ()
tree2c56a6561c2101cab1b62b81887d15a4fb944d86
parent2cfd4473d6970dc9b82dd9326a22550dd46855c7 (diff)
* enc/make_encdb.rb: added. search enc/*.c and make encoding database.
* regenc.h (ENC_REPLICATE, ENC_ALIAS): added for defining replica encoding and encoding alias. * encoding.c (rb_enc_init): move alias definitions to enc/*.c. (rb_enc_find_index): search original of replica and alias when no encoding library. (rb_enc_name_list, rb_enc_aliases_enc_i, rb_enc_aliases_str_i, rb_enc_aliases, Encoding.name_list, Encoding.aliases): added. (Init_Encoding): init encdb. * enc/ascii.c, enc/us_ascii.c, enc/euc_jp.c, enc/sjis.c: add replica encoding and encoding alias difinition. * common.mk (dist-clean-local): add rule for remvoe encdb.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog21
-rw-r--r--common.mk7
-rw-r--r--enc/ascii.c1
-rw-r--r--enc/euc_jp.c1
-rwxr-xr-xenc/make_encdb.rb65
-rw-r--r--enc/sjis.c4
-rw-r--r--enc/us_ascii.c3
-rw-r--r--encoding.c69
-rw-r--r--regenc.h4
9 files changed, 154 insertions, 21 deletions
@@ -1,10 +1,27 @@
Sat Jan 12 18:27:41 2008 Nobuyoshi Nakada <[email protected]>
* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
define/undef on a signleton class. [ruby-core:09959]
-9959]
-
Sat Jan 12 12:44:36 2008 NARUSE, Yui <[email protected]>
* ext/nkf/nkf.c: rdoc update.
@@ -312,7 +312,7 @@ clean-enc:
distclean: distclean-ext distclean-local distclean-enc
distclean-local:: clean-local
- @$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb
@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
distclean-ext:
@@ -431,7 +431,7 @@ dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
{$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
- {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h
enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
{$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
{$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}util.h
@@ -708,6 +708,9 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}revision.h
node_name.inc: {$(VPATH)}node.h
$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
@@ -47,3 +47,4 @@ OnigEncodingDefine(ascii, ASCII) = {
onigenc_single_byte_left_adjust_char_head,
onigenc_always_true_is_allowed_reverse_match
};
@@ -361,3 +361,4 @@ OnigEncodingDefine(euc_jp, EUC_JP) = {
is_allowed_reverse_match,
0
};
@@ -0,0 +1,65 @@
@@ -370,3 +370,7 @@ OnigEncodingDefine(sjis, SJIS) = {
is_allowed_reverse_match,
0
};
@@ -26,3 +26,6 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
onigenc_single_byte_left_adjust_char_head,
onigenc_always_true_is_allowed_reverse_match
};
@@ -12,6 +12,7 @@
#include "ruby/ruby.h"
#include "ruby/encoding.h"
#include "regenc.h"
#include <ctype.h>
#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
@@ -291,8 +292,6 @@ rb_enc_alias(const char *alias, const char *orig)
enum {
ENCINDEX_ASCII,
- ENCINDEX_EUC_JP,
- ENCINDEX_SJIS,
ENCINDEX_UTF8,
ENCINDEX_BUILTIN_MAX
};
@@ -303,14 +302,8 @@ rb_enc_init(void)
enc_table_count = enc_table_expand(ENCINDEX_BUILTIN_MAX);
#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(ONIG_ENCODING_##enc), ONIG_ENCODING_##enc)
ENC_REGISTER(ASCII);
- ENC_REGISTER(EUC_JP);
- ENC_REGISTER(SJIS);
ENC_REGISTER(UTF8);
#undef ENC_REGISTER
- enc_alias("ASCII", rb_enc_name(ONIG_ENCODING_ASCII));
- enc_alias("BINARY", rb_enc_name(ONIG_ENCODING_ASCII));
- enc_alias("eucJP", rb_enc_name(ONIG_ENCODING_EUC_JP)); /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */
- enc_alias("SJIS", rb_enc_name(ONIG_ENCODING_SJIS));
}
rb_encoding *
@@ -373,6 +366,20 @@ rb_enc_find_index(const char *name)
OBJ_FREEZE(enclib);
if (RTEST(rb_protect(require_enc, enclib, 0)))
i = rb_enc_registered(name);
rb_set_errinfo(Qnil);
}
return i;
@@ -978,6 +985,40 @@ set_encoding_alias(st_data_t name, st_data_t orig, st_data_t arg)
return ST_CONTINUE;
}
void
Init_Encoding(void)
{
@@ -993,6 +1034,8 @@ Init_Encoding(void)
rb_define_method(rb_cEncoding, "base_encoding", enc_base_encoding, 0);
rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0);
rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1);
rb_define_singleton_method(rb_cEncoding, "compatible?", enc_compatible_p, 2);
@@ -1005,15 +1048,7 @@ Init_Encoding(void)
/* dummy for unsupported, statefull encoding */
rb_define_dummy_encoding("ISO-2022-JP");
- rb_enc_replicate("Windows-31J", rb_enc_from_index(ENCINDEX_SJIS));
- rb_enc_alias("CP932", "Windows-31J");
- rb_enc_alias("csWindows31J", "Windows-31J"); /* IANA. IE6 don't accept Windows-31J but csWindows31J. */
-
- for (i = 0; i < enc_table_size; ++i) {
- rb_encoding *enc = enc_table[i].enc;
- if (enc) set_encoding_const(rb_enc_name(enc), enc);
- }
- st_foreach(enc_table_alias, set_encoding_alias, 0);
}
/* locale insensitive functions */
@@ -199,4 +199,8 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*);
#define OnigEncodingDefine(f,n) OnigEncodingDeclare(n)
#endif
#endif /* REGENC_H */
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 22:17:43 +0000