ruby-changes:2234
From: ko1@a...
Date: 17 Oct 2007 01:57:37 +0900
Subject: [ruby-changes:2234] nobu - Ruby:r13725 (trunk): * re.c (rb_reg_initialize_m): allow binary encoding option.
nobu 2007-10-17 01:57:08 +0900 (Wed, 17 Oct 2007) New Revision: 13725 Modified files: trunk/ChangeLog trunk/re.c trunk/version.h Log: * re.c (rb_reg_initialize_m): allow binary encoding option. [ruby-dev:32083] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13725&r2=13724 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13725&r2=13724 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=13725&r2=13724 Index: re.c =================================================================== --- re.c (revision 13724) +++ re.c (revision 13725) @@ -1573,7 +1573,7 @@ int flags = 0; VALUE str; - if (argc == 0 || argc > 2) { + if (argc == 0 || argc > 3) { rb_raise(rb_eArgError, "wrong number of arguments"); } if (TYPE(argv[0]) == T_REGEXP) { @@ -1600,7 +1600,17 @@ if (FIXNUM_P(argv[1])) flags = FIX2INT(argv[1]); else if (RTEST(argv[1])) flags = ONIG_OPTION_IGNORECASE; } + if (argc == 3 && !NIL_P(argv[2])) { + char *kcode = StringValuePtr(argv[2]); + if (kcode[0] == 'n' || kcode[1] == 'N') { + flags |= ARG_KCODE_NONE; + } + else { + rb_warning("encoding option is obsolete - %s", kcode); + } + } str = argv[0]; + StringValueCStr(str); if (rb_reg_initialize_str(self, str, flags, err)) { rb_reg_raise_str(str, flags, err); } Index: ChangeLog =================================================================== --- ChangeLog (revision 13724) +++ ChangeLog (revision 13725) @@ -1,3 +1,8 @@ +Wed Oct 17 01:57:06 2007 Nobuyoshi Nakada <nobu@r...> + + * re.c (rb_reg_initialize_m): allow binary encoding option. + [ruby-dev:32083] + Tue Oct 16 19:48:01 2007 Nobuyoshi Nakada <nobu@r...> * re.c (rb_reg_s_union): check for encoding of original object. Index: version.h =================================================================== --- version.h (revision 13724) +++ version.h (revision 13725) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-10-16" +#define RUBY_RELEASE_DATE "2007-10-17" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071016 +#define RUBY_RELEASE_CODE 20071017 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml