diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | re.c | 11 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Feb 25 19:58:48 2016 Zachary Scott <zzak@ruby-lang.org> + + * re.c: Remove deprecated kcode argument from Regexp.new and compile + patch provided by Dylan Pulliam [Bug #11495] + Thu Feb 25 19:49:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/socket/socket.c (sock_gethostname): support unlimited size @@ -2935,10 +2935,10 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re) /* * call-seq: - * Regexp.new(string, [options [, kcode]]) -> regexp - * Regexp.new(regexp) -> regexp - * Regexp.compile(string, [options [, kcode]]) -> regexp - * Regexp.compile(regexp) -> regexp + * Regexp.new(string, [options]) -> regexp + * Regexp.new(regexp) -> regexp + * Regexp.compile(string, [options) -> regexp + * Regexp.compile(regexp) -> regexp * * Constructs a new regular expression from +pattern+, which can be either a * String or a Regexp (in which case that regexp's options are propagated), @@ -2949,9 +2949,6 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re) * <em>or</em>-ed together. Otherwise, if +options+ is not * +nil+ or +false+, the regexp will be case insensitive. * - * When the +kcode+ parameter is `n' or `N' sets the regexp no encoding. - * It means that the regexp is for binary strings. - * * r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/ * r2 = Regexp.new('cat', true) #=> /cat/i * r3 = Regexp.new(r2) #=> /cat/i @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 455 +#define RUBY_PATCHLEVEL 456 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2 |