From c6b8f89c2e0e95d7e5a7ebcf88565478475f8ed7 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 22 Dec 2007 01:32:21 +0000 Subject: [PATCH] * parse.y (reg_named_capture_assign_iter): captured name should not be reserved word. a patch from Keita Yamaguchi in [ruby-dev:32675]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ parse.y | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8ac2f02f88..ef54013645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 22 10:25:44 2007 Yukihiro Matsumoto + + * parse.y (reg_named_capture_assign_iter): captured name should + not be reserved word. a patch from Keita Yamaguchi + in [ruby-dev:32675]. + Sat Dec 22 10:19:08 2007 Yukihiro Matsumoto * eval.c (rb_f_method_name): now __method__ and __callee__ are diff --git a/parse.y b/parse.y index 9cb3e18e83..f63ff3667a 100644 --- a/parse.y +++ b/parse.y @@ -8516,7 +8516,8 @@ reg_named_capture_assign_iter(const OnigUChar *name, const OnigUChar *name_end, arg->fail_block = NEW_BEGIN(0); } - if (!(len && rb_enc_islower(*name, enc) && rb_enc_symname2_p(s, len, enc))) { + if (!(len && rb_enc_islower(*name, enc) && rb_enc_symname2_p(s, len, enc)) + || rb_reserved_word(name, len)) { compile_error(PARSER_ARG "named capture with a non local variable - %.*s", len, name); return ST_CONTINUE;