diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | re.c | 11 |
2 files changed, 9 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Tue Feb 9 13:52:49 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] + Mon Feb 8 21:26:19 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for @@ -3058,10 +3058,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), @@ -3072,9 +3072,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 |