ruby-changes:4424
From: ko1@a...
Date: Mon, 7 Apr 2008 15:51:54 +0900 (JST)
Subject: [ruby-changes:4424] nobu - Ruby:r15915 (trunk): * encoding.c (enc_init_db): moved to enc/encdb.c.
nobu 2008-04-07 15:51:33 +0900 (Mon, 07 Apr 2008) New Revision: 15915 Added files: trunk/enc/encdb.c trunk/enc/prelude.rb trunk/enc/trans/transdb.c Removed files: trunk/dmytranscode.c Modified files: trunk/ChangeLog trunk/common.mk trunk/dmyencoding.c trunk/enc/depend trunk/encoding.c trunk/transcode.c Log: * encoding.c (enc_init_db): moved to enc/encdb.c. * transcode.c (init_transcoder_table): moved to enc/trans/transdb.c. * enc/depend (enc/encdb.o enc/trans/transdb.o): depend on corresponding headers. * common.mk (COMMONOBJS): moved transcode.o from OBJS http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/encdb.c?revision=15915&view=markup http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/encdb.c?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/transcode.c?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/prelude.rb?revision=15915&view=markup http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/prelude.rb?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dmyencoding.c?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/trans/transdb.c?revision=15915&view=markup http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/trans/transdb.c?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=15915&r2=15914&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dmytranscode.c http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15915&r2=15914&diff_format=u Index: dmytranscode.c =================================================================== --- dmytranscode.c (revision 15914) +++ dmytranscode.c (revision 15915) @@ -1,2 +0,0 @@ -#define NO_TRANSDB_H 1 -#include "transcode.c" Index: encoding.c =================================================================== --- encoding.c (revision 15914) +++ encoding.c (revision 15915) @@ -34,29 +34,7 @@ void rb_enc_init(void); -#ifndef NO_ENCDB_H -#undef ENC_REPLICATE -#undef ENC_ALIAS -#undef ENC_DUMMY -static int encdb_replicate(const char *alias, const char *orig); -static int encdb_alias(const char *alias, const char *orig); -static int encdb_dummy(const char *name); -static void encdb_declare(const char *name); -#define ENC_REPLICATE(name, orig) encdb_replicate(name, orig) -#define ENC_ALIAS(name, orig) encdb_alias(name, orig) -#define ENC_DUMMY(name) encdb_dummy(name) -#define ENC_DEFINE(name) encdb_declare(name) -#endif - -static void -enc_init_db(void) -{ -#ifdef NO_ENCDB_H #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX -#else -#include "encdb.h" -#endif -} #define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc)) @@ -251,9 +229,8 @@ return index; } -#ifndef NO_ENCDB_H -static void -encdb_declare(const char *name) +void +rb_encdb_declare(const char *name) { int idx = rb_enc_registered(name); if (idx < 0) { @@ -261,7 +238,6 @@ } set_encoding_const(name, rb_enc_from_index(idx)); } -#endif static void enc_check_duplication(const char *name) @@ -293,7 +269,6 @@ return idx; } -#ifndef NO_ENCDB_H static int enc_replicate(int idx, const char *name, rb_encoding *origenc) { @@ -310,8 +285,8 @@ return idx; } -static int -encdb_replicate(const char *name, const char *orig) +int +rb_encdb_replicate(const char *name, const char *orig) { int origidx = rb_enc_registered(orig); int idx = rb_enc_registered(name); @@ -321,7 +296,6 @@ } return enc_replicate(idx, name, rb_enc_from_index(origidx)); } -#endif int rb_define_dummy_encoding(const char *name) @@ -333,9 +307,8 @@ return index; } -#ifndef NO_ENCDB_H -static int -encdb_dummy(const char *name) +int +rb_encdb_dummy(const char *name) { int index = enc_replicate(rb_enc_registered(name), name, rb_ascii8bit_encoding()); @@ -344,7 +317,6 @@ ENC_SET_DUMMY(enc); return index; } -#endif int rb_enc_dummy_p(rb_encoding *enc) @@ -398,9 +370,8 @@ return enc_alias(alias, idx); } -#ifndef NO_ENCDB_H -static int -encdb_alias(const char *alias, const char *orig) +int +rb_encdb_alias(const char *alias, const char *orig) { int idx = rb_enc_registered(orig); @@ -409,7 +380,6 @@ } return enc_alias(alias, idx); } -#endif enum { ENCINDEX_ASCII, @@ -1225,8 +1195,6 @@ rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0); rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); - - enc_init_db(); } /* locale insensitive functions */ Index: ChangeLog =================================================================== --- ChangeLog (revision 15914) +++ ChangeLog (revision 15915) @@ -1,3 +1,14 @@ +Mon Apr 7 15:51:31 2008 Nobuyoshi Nakada <nobu@r...> + + * encoding.c (enc_init_db): moved to enc/encdb.c. + + * transcode.c (init_transcoder_table): moved to enc/trans/transdb.c. + + * enc/depend (enc/encdb.o enc/trans/transdb.o): depend on + corresponding headers. + + * common.mk (COMMONOBJS): moved transcode.o from OBJS + Mon Apr 7 12:26:32 2008 Koichi Sasada <ko1@a...> * bootstraptest/test_knownbug.rb: add a known-bug. Index: enc/encdb.c =================================================================== --- enc/encdb.c (revision 0) +++ enc/encdb.c (revision 15915) @@ -0,0 +1,25 @@ +/********************************************************************** + + enc/encdb.c - + + $Author$ + created at: Mon Apr 7 15:51:31 2008 + + Copyright (C) 2008 Yukihiro Matsumoto + +**********************************************************************/ + +int rb_encdb_replicate(const char *alias, const char *orig); +int rb_encdb_alias(const char *alias, const char *orig); +int rb_encdb_dummy(const char *name); +void rb_encdb_declare(const char *name); +#define ENC_REPLICATE(name, orig) rb_encdb_replicate(name, orig) +#define ENC_ALIAS(name, orig) rb_encdb_alias(name, orig) +#define ENC_DUMMY(name) rb_encdb_dummy(name) +#define ENC_DEFINE(name) rb_encdb_declare(name) + +void +Init_encdb(void) +{ +#include "encdb.h" +} Property changes on: enc/encdb.c ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:keywords + Author Id Revision Index: enc/prelude.rb =================================================================== --- enc/prelude.rb (revision 0) +++ enc/prelude.rb (revision 15915) @@ -0,0 +1,6 @@ +%w'enc/init enc/trans/init'.each do |init| + begin + require(init) + rescue LoadError + end +end Property changes on: enc/prelude.rb ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:keywords + Author Id Revision Index: enc/trans/transdb.c =================================================================== --- enc/trans/transdb.c (revision 0) +++ enc/trans/transdb.c (revision 15915) @@ -0,0 +1,18 @@ +/********************************************************************** + + enc/trans/transdb.c - + + $Author$ + created at: Mon Apr 7 15:51:31 2008 + + Copyright (C) 2008 Yukihiro Matsumoto + +**********************************************************************/ + +void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib); + +void +Init_transdb(void) +{ +#include "transdb.h" +} Property changes on: enc/trans/transdb.c ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:keywords + Author Id Revision Index: enc/depend =================================================================== --- enc/depend (revision 15914) +++ enc/depend (revision 15915) @@ -54,5 +54,8 @@ <%=COMPILE_C.sub(/\$\(<(?:.*)\)/) {"$(srcdir)/enc/#{e}.c"}%> % end +enc/encdb.$(OBJEXT): encdb.h +enc/trans/transdb.$(OBJEXT): transdb.h + clean: @$(RM) $(ENCSOS) $(ENCDEFS) $(ENCOBJS) $(TRANSSOS) $(TRANSDEFS) $(TRANSOBJS) Index: common.mk =================================================================== --- common.mk (revision 15914) +++ common.mk (revision 15915) @@ -18,7 +18,7 @@ MAINOBJ = $(NORMALMAINOBJ) EXTOBJS = DLDOBJS = $(DMYEXT) -MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT) +MINIOBJS = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT) COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ @@ -62,6 +62,7 @@ string.$(OBJEXT) \ struct.$(OBJEXT) \ time.$(OBJEXT) \ + transcode.$(OBJEXT) \ util.$(OBJEXT) \ variable.$(OBJEXT) \ version.$(OBJEXT) \ @@ -80,7 +81,6 @@ OBJS = dln.$(OBJEXT) \ encoding.$(OBJEXT) \ prelude.$(OBJEXT) \ - transcode.$(OBJEXT) \ $(COMMONOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) @@ -445,7 +445,7 @@ {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \ {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \ {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h -encoding.$(OBJEXT): dmyencoding.$(OBJEXT) {$(VPATH)}encdb.h +encoding.$(OBJEXT): dmyencoding.$(OBJEXT) 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 @@ -596,11 +596,10 @@ {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}vm.h \ {$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).c -dmytranscode.$(OBJEXT): {$(VPATH)}transcode.c {$(VPATH)}ruby.h \ +transcode.$(OBJEXT): {$(VPATH)}transcode.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)}transcode_data.h -transcode.$(OBJEXT): dmytranscode.$(OBJEXT) {$(VPATH)}transdb.h cont.$(OBJEXT): {$(VPATH)}cont.c {$(VPATH)}ruby.h {$(VPATH)}config.h \ {$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \ {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h {$(VPATH)}node.h \ @@ -737,7 +736,7 @@ prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(PREP) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \ - $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@.new + $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb $@.new $(IFCHANGE) "$@" "$@.new" golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) Index: dmyencoding.c =================================================================== --- dmyencoding.c (revision 15914) +++ dmyencoding.c (revision 15915) @@ -1,3 +1,2 @@ -#define NO_ENCDB_H 1 #define NO_LOCALE_CHARMAP 1 #include "encoding.c" Index: transcode.c =================================================================== --- transcode.c (revision 15914) +++ transcode.c (revision 15915) @@ -85,14 +85,6 @@ declare_transcoder(enc2, enc1, lib); } -static void -init_transcoder_table(void) -{ -#ifndef NO_TRANSDB_H -#include "transdb.h" -#endif -} - #define encoding_equal(enc1, enc2) (STRCASECMP(enc1, enc2) == 0) static const rb_transcoder * @@ -451,7 +443,6 @@ { transcoder_table = st_init_strcasetable(); transcoder_lib_table = st_init_strcasetable(); - init_transcoder_table(); sym_invalid = ID2SYM(rb_intern("invalid")); sym_ignore = ID2SYM(rb_intern("ignore")); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/