kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 53784: [Backport #11495]

Browse source 
* re.c: Remove deprecated kcode argument from Regexp.new and compile
	  patch provided by Dylan Pulliam [Bug #11495]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 05:52:55 +00:00
parent 3c555c92f1
commit 14e5aab8b5
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Mar 29 14:52:20 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]
Tue Mar 29 14:44:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/socket/socket.c (sock_gethostname): support unlimited size

11
re.c
View file

@ -3001,10 +3001,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),
@ -3015,9 +3015,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

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 18
#define RUBY_PATCHLEVEL 19
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3