ruby-changes:10790
From: shyouhei <ko1@a...>
Date: Mon, 16 Feb 2009 23:30:45 +0900 (JST)
Subject: [ruby-changes:10790] Ruby:r22357 (ruby_1_8_7): merge revision(s) 20300:
shyouhei 2009-02-16 23:30:37 +0900 (Mon, 16 Feb 2009) New Revision: 22357 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22357 Log: merge revision(s) 20300: * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: fix NameError bug. Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/ext/tk/lib/tkextlib/blt/vector.rb branches/ruby_1_8_7/ext/tk/lib/tkextlib/blt.rb branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ext/tk/lib/tkextlib/blt/vector.rb =================================================================== --- ruby_1_8_7/ext/tk/lib/tkextlib/blt/vector.rb (revision 22356) +++ ruby_1_8_7/ext/tk/lib/tkextlib/blt/vector.rb (revision 22357) @@ -49,11 +49,11 @@ size = size.join(':') end if size - @id = INTERP._invoke('::blt::vector', 'create', - "#auto(#{size})", *hash_kv(keys)) + @id = TkCore::INTERP._invoke('::blt::vector', 'create', + "#auto(#{size})", *hash_kv(keys)) else - @id = INTERP._invoke('::blt::vector', 'create', - "#auto", *hash_kv(keys)) + @id = TkCore::INTERP._invoke('::blt::vector', 'create', + "#auto", *hash_kv(keys)) end TkVar_ID_TBL.mutex.synchronize{ @@ -68,7 +68,7 @@ @trace_opts = nil # teach Tk-ip that @id is global var - INTERP._invoke_without_enc('global', @id) + TkCore::INTERP._invoke_without_enc('global', @id) end def destroy @@ -250,7 +250,7 @@ @trace_opts = nil # teach Tk-ip that @id is global var - INTERP._invoke_without_enc('global', @id) + TkCore::INTERP._invoke_without_enc('global', @id) end end end Index: ruby_1_8_7/ext/tk/lib/tkextlib/blt.rb =================================================================== --- ruby_1_8_7/ext/tk/lib/tkextlib/blt.rb (revision 22356) +++ ruby_1_8_7/ext/tk/lib/tkextlib/blt.rb (revision 22357) @@ -26,14 +26,14 @@ PATCH_LEVEL = tk_call('set', 'blt_patchLevel') begin - lib = INTERP._invoke('set', 'blt_library') + lib = TkCore::INTERP._invoke('set', 'blt_library') rescue lib = '' end LIBRARY = TkVarAccess.new('blt_library', lib) begin - lib = INTERP._invoke('set', 'blt_libPath') + lib = TkCore::INTERP._invoke('set', 'blt_libPath') rescue lib = '' end Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 22356) +++ ruby_1_8_7/ChangeLog (revision 22357) @@ -1,3 +1,8 @@ +Mon Feb 16 23:30:24 2009 Hidetoshi NAGAI <nagai@a...> + + * ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: + fix NameError bug. + Mon Feb 16 23:08:22 2009 Nobuyoshi Nakada <nobu@r...> * string.c (rb_str_s_alloc, rb_str_replace): use null_str as well as Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 22356) +++ ruby_1_8_7/version.h (revision 22357) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-16" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090216 -#define RUBY_PATCHLEVEL 121 +#define RUBY_PATCHLEVEL 122 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/