diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-01-13 21:15:13 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-01-13 21:16:00 +0900 |
commit | 0036648a420f945624898568bb82bc5f83195d12 (patch) | |
tree | 1ddad9a8be124fb58f74b614caddd20564a1b584 | |
parent | e9b93d67baf8a6add548b7e5c702665100e4b3c9 (diff) | |
download | ruby-0036648a420f945624898568bb82bc5f83195d12.tar.gz |
Capture to reserved name variables if already defined [Bug #17533]
-rw-r--r-- | parse.y | 5 | ||||
-rw-r--r-- | test/ruby/test_regexp.rb | 11 |
2 files changed, 14 insertions, 2 deletions
@@ -12811,12 +12811,13 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end, NODE *node, *succ; 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) return ST_CONTINUE; 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), NO_LEX_CTXT, arg->loc); succ = arg->succ_block; if (!succ) succ = NEW_BEGIN(0, arg->loc); diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 194b8c355d..495c9de919 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -229,6 +229,17 @@ class TestRegexp < Test::Unit::TestCase def test_assign_named_capture_to_reserved_word /(?<nil>.)/ =~ "a" 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 def test_assign_named_capture_to_const |