ruby-changes:11620
From: nobu <ko1@a...>
Date: Wed, 22 Apr 2009 12:20:28 +0900 (JST)
Subject: [ruby-changes:11620] Ruby:r23257 (ruby_1_8): * eval.c (proc_invoke): shares dmethod scope local variables.
nobu 2009-04-22 12:20:14 +0900 (Wed, 22 Apr 2009) New Revision: 23257 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23257 Log: * eval.c (proc_invoke): shares dmethod scope local variables. a patch from coderrr at [ruby-core:23050] * gc.c (obj_free): do not free cloned scope local variables. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/eval.c branches/ruby_1_8/gc.c branches/ruby_1_8/test/ruby/test_proc.rb branches/ruby_1_8/version.h Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 23256) +++ ruby_1_8/ChangeLog (revision 23257) @@ -1,3 +1,10 @@ +Wed Apr 22 12:20:13 2009 Nobuyoshi Nakada <nobu@r...> + + * eval.c (proc_invoke): shares dmethod scope local variables. + a patch from coderrr at [ruby-core:23050] + + * gc.c (obj_free): do not free cloned scope local variables. + Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@r...> * lib/mkmf.rb (init_mkmf): needs default library path even if Index: ruby_1_8/version.h =================================================================== --- ruby_1_8/version.h (revision 23256) +++ ruby_1_8/version.h (revision 23257) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2009-04-21" +#define RUBY_RELEASE_DATE "2009-04-22" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20090421 +#define RUBY_RELEASE_CODE 20090422 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8/test/ruby/test_proc.rb =================================================================== --- ruby_1_8/test/ruby/test_proc.rb (revision 23256) +++ ruby_1_8/test/ruby/test_proc.rb (revision 23257) @@ -91,4 +91,14 @@ assert_equal(10, Proc.new{|&b| b.call(10)}.call {|x| x}) assert_equal(12, Proc.new{|a,&b| b.call(a)}.call(12) {|x| x}) end + + def test_define_method_scope + a = 1 + c = Class.new + c.send(:define_method, :x) do |*| + lambda {a = 2}.call + end + c.new.x(nil) + assert_equal(2, a, '[ruby-core:23050]') + end end Index: ruby_1_8/eval.c =================================================================== --- ruby_1_8/eval.c (revision 23256) +++ ruby_1_8/eval.c (revision 23257) @@ -8942,7 +8942,7 @@ OBJSETUP(scope, tmp, T_SCOPE); scope->local_tbl = _block.scope->local_tbl; scope->local_vars = _block.scope->local_vars; - scope->flags |= SCOPE_CLONE; + scope->flags |= SCOPE_CLONE | (_block.scope->flags & SCOPE_MALLOC); _block.scope = scope; } /* modify current frame */ Index: ruby_1_8/gc.c =================================================================== --- ruby_1_8/gc.c (revision 23256) +++ ruby_1_8/gc.c (revision 23257) @@ -1380,7 +1380,7 @@ VALUE *vars = RANY(obj)->as.scope.local_vars-1; if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0) RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl)); - if (RANY(obj)->as.scope.flags & SCOPE_MALLOC) + if ((RANY(obj)->as.scope.flags & (SCOPE_MALLOC|SCOPE_CLONE)) == SCOPE_MALLOC) RUBY_CRITICAL(free(vars)); } break; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/