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) 0036648a42: [Backport #17533]

Browse source 
Capture to reserved name variables if already defined [Bug #17533]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2021-04-04 23:43:53 +00:00
parent 8890779077
commit fd734d4992
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
parse.y
View file

@ -10684,12 +10684,13 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end,
NODE *node, *succ; NODE *node, *succ;
if (!len) return ST_CONTINUE; if (!len) return ST_CONTINUE;
if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len))
return ST_CONTINUE;
if (rb_enc_symname_type(s, len, enc, (1U<<ID_LOCAL)) != ID_LOCAL) if (rb_enc_symname_type(s, len, enc, (1U<<ID_LOCAL)) != ID_LOCAL)
return ST_CONTINUE; return ST_CONTINUE;
var = intern_cstr(s, len, enc); var = intern_cstr(s, len, enc);
if (len < MAX_WORD_LENGTH && rb_reserved_word(s, (int)len)) {
if (!lvar_defined(p, var)) return ST_CONTINUE;
}
node = node_assign(p, assignable(p, var, 0, arg->loc), NEW_LIT(ID2SYM(var), arg->loc), arg->loc); node = node_assign(p, assignable(p, var, 0, arg->loc), NEW_LIT(ID2SYM(var), arg->loc), arg->loc);
succ = arg->succ_block; succ = arg->succ_block;
if (!succ) succ = NEW_BEGIN(0, arg->loc); if (!succ) succ = NEW_BEGIN(0, arg->loc);

11
test/ruby/test_regexp.rb
View file

@ -218,6 +218,17 @@ class TestRegexp < Test::Unit::TestCase
def test_assign_named_capture_to_reserved_word def test_assign_named_capture_to_reserved_word
/(?<nil>.)/ =~ "a" /(?<nil>.)/ =~ "a"
assert_not_include(local_variables, :nil, "[ruby-dev:32675]") assert_not_include(local_variables, :nil, "[ruby-dev:32675]")
def (obj = Object.new).test(s, nil: :ng)
/(?<nil>.)/ =~ s
binding.local_variable_get(:nil)
end
assert_equal("b", obj.test("b"))
tap do |nil: :ng|
/(?<nil>.)/ =~ "c"
assert_equal("c", binding.local_variable_get(:nil))
end
end end
def test_assign_named_capture_to_const def test_assign_named_capture_to_const

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.6.7" #define RUBY_VERSION "2.6.7"
#define RUBY_RELEASE_DATE "2021-04-05" #define RUBY_RELEASE_DATE "2021-04-05"
#define RUBY_PATCHLEVEL 186 #define RUBY_PATCHLEVEL 187
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4