From dede45a5a45316029506cdbb9c017ed04a8489f8 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 11 Aug 2011 00:38:13 +0000 Subject: merges r32271 from trunk into ruby_1_9_2. -- * lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!). global_variables, local_variables, and instance_variables returns Symbols from 1.9 and need to stringify before evaling it. See #4931. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/debug.rb | 2 +- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f0697c08e..f66ad5c678 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jun 28 20:39:29 2011 Hiroshi Nakamura + + * lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!). + global_variables, local_variables, and instance_variables returns + Symbols from 1.9 and need to stringify before evaling it. + See #4931. + Tue Jun 28 07:50:32 2011 Eric Hodel * object.c (Init_Object): Teach RDoc what Init_class_hierarchy does to diff --git a/lib/debug.rb b/lib/debug.rb index 10236c352d..5cbd7f7aab 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -147,7 +147,7 @@ class Context def var_list(ary, binding) ary.sort! for v in ary - stdout.printf " %s => %s\n", v, eval(v, binding).inspect + stdout.printf " %s => %s\n", v, eval(v.to_s, binding).inspect end end diff --git a/version.h b/version.h index a42d5ffffb..563c94dbb4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 300 +#define RUBY_PATCHLEVEL 301 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3