summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/test_variable.rb11
-rw-r--r--vm_eval.c2
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 331f336..8b3e1f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 11 17:38:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_eval.c (local_var_list_add): skip internal local variable
+ name by its type but not if it has a name. internal local
+ variable names are just unique per frame, not globally.
+ [ruby-core:71437] [Bug #11674]
+
Wed Nov 11 14:14:33 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* transcode.c: fix a typo
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index f04e358..06a8e2f 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -136,4 +136,15 @@ class TestVariable < Test::Unit::TestCase
end
end
end
+
+ def test_local_variables_with_kwarg
+ bug11674 = '[ruby-core:71437] [Bug #11674]'
+ v = with_kwargs_11(v1:1,v2:2,v3:3,v4:4,v5:5,v6:6,v7:7,v8:8,v9:9,v10:10,v11:11)
+ assert_equal(%i(v1 v2 v3 v4 v5 v6 v7 v8 v9 v10 v11), v, bug11674)
+ end
+
+ private
+ def with_kwargs_11(v1:, v2:, v3:, v4:, v5:, v6:, v7:, v8:, v9:, v10:, v11:)
+ local_variables
+ end
end
diff --git a/vm_eval.c b/vm_eval.c
index 55d7381..ed44c29 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -2066,7 +2066,7 @@ local_var_list_update(st_data_t *key, st_data_t *value, st_data_t arg, int exist
static void
local_var_list_add(const struct local_var_list *vars, ID lid)
{
- if (lid && rb_id2str(lid)) {
+ if (lid && rb_is_local_id(lid)) {
/* should skip temporary variable */
st_table *tbl = RHASH_TBL_RAW(vars->tbl);
st_data_t idx = 0; /* tbl->num_entries */