ruby-changes:3558
From: ko1@a...
Date: Mon, 14 Jan 2008 22:49:49 +0900 (JST)
Subject: [ruby-changes:3558] matz - Ruby:r15047 (trunk): * re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
matz 2008-01-14 22:49:29 +0900 (Mon, 14 Jan 2008) New Revision: 15047 Modified files: trunk/ChangeLog trunk/enc/Makefile.in trunk/encoding.c trunk/re.c trunk/rubytest.rb Log: * re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead of using fixed index value. * enc/Makefile.in (encsrcdir): make US-ASCII built-in. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/rubytest.rb?r1=15047&r2=15046&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15047&r2=15046&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=15047&r2=15046&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15047&r2=15046&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/Makefile.in?r1=15047&r2=15046&diff_format=u Index: encoding.c =================================================================== --- encoding.c (revision 15046) +++ encoding.c (revision 15047) @@ -304,9 +304,12 @@ enum { ENCINDEX_ASCII, ENCINDEX_UTF8, + ENCINDEX_US_ASCII, ENCINDEX_BUILTIN_MAX }; +extern rb_encoding OnigEncodingUS_ASCII; + void rb_enc_init(void) { @@ -314,6 +317,7 @@ #define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(ONIG_ENCODING_##enc), ONIG_ENCODING_##enc) ENC_REGISTER(ASCII); ENC_REGISTER(UTF8); + enc_register_at(ENCINDEX_US_ASCII, rb_enc_name(&OnigEncodingUS_ASCII), &OnigEncodingUS_ASCII); #undef ENC_REGISTER } Index: re.c =================================================================== --- re.c (revision 15046) +++ re.c (revision 15047) @@ -142,12 +142,6 @@ #define ARG_ENCODING_FIXED 16 #define ARG_ENCODING_NONE 32 -#define ARG_KCODE_NONE 0 -#define ARG_KCODE_EUC 1 -#define ARG_KCODE_SJIS 2 -#define ARG_KCODE_UTF8 3 -#define ARG_KCODE_MASK 3 - static int char_to_option(int c) { @@ -191,13 +185,13 @@ *kcode = -1; return (*option = ARG_ENCODING_NONE); case 'e': - *kcode = ARG_KCODE_EUC; + *kcode = rb_enc_find_index("EUC-JP"); break; case 's': - *kcode = ARG_KCODE_SJIS; + *kcode = rb_enc_find_index("Shitf_JIS"); break; case 'u': - *kcode = ARG_KCODE_UTF8; + *kcode = rb_enc_find_index("UTF-8"); break; default: *kcode = -1; Index: ChangeLog =================================================================== --- ChangeLog (revision 15046) +++ ChangeLog (revision 15047) @@ -1,3 +1,10 @@ +Mon Jan 14 22:48:16 2008 Yukihiro Matsumoto <matz@r...> + + * re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead + of using fixed index value. + + * enc/Makefile.in (encsrcdir): make US-ASCII built-in. + Mon Jan 14 22:25:02 2008 WATANABE Hirofumi <eban@r...> * golf_prelude.rb: Shorter method name completion. Same method Index: enc/Makefile.in =================================================================== --- enc/Makefile.in (revision 15046) +++ enc/Makefile.in (revision 15047) @@ -14,7 +14,7 @@ DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ -BUILTIN_ENCS = ascii.c \ +BUILTIN_ENCS = ascii.c us_ascii.c\ unicode.c utf8.c RUBY_SO_NAME = @RUBY_SO_NAME@ Index: rubytest.rb =================================================================== --- rubytest.rb (revision 15046) +++ rubytest.rb (revision 15047) @@ -37,7 +37,7 @@ error = '' srcdir = File.dirname(__FILE__) -`#{ruby} -I#{srcdir} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line| +`#{ruby} -I.ext/#{RUBY_PLATFORM} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line| if line =~ /^end of test/ print "\ntest succeeded\n" exit true -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/