1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.

* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert
  a tcl string to a ruby object if the tcl string includes "\n".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2006-06-27 13:51:45 +00:00
parent 3ea6bebbad
commit efb806f46c
3 changed files with 14 additions and 7 deletions

View file

@ -1,3 +1,10 @@
Tue Jun 27 22:47:18 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] somtimes fail to convert
a tcl string to a ruby object if the tcl string includes "\n".
Tue Jun 27 16:04:05 2006 WATANABE Hirofumi <eban@ruby-lang.org> Tue Jun 27 16:04:05 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* win32/win32.h: define isascii on MinGW for msvcrt compatibility. * win32/win32.h: define isascii on MinGW for msvcrt compatibility.

View file

@ -209,17 +209,17 @@ module TkComm
# return val.split.collect{|v| tk_tcl2ruby(v)} # return val.split.collect{|v| tk_tcl2ruby(v)}
#end #end
case val case val
when /^@font/ when /\A@font\S+\z/
TkFont.get_obj(val) TkFont.get_obj(val)
when /^-?\d+$/ when /\A-?\d+\z/
val.to_i val.to_i
when /^\./ when /\A\.\S*\z/
#Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val) #Tk_WINDOWS[val] ? Tk_WINDOWS[val] : _genobj_for_tkwidget(val)
TkCore::INTERP.tk_windows[val]? TkCore::INTERP.tk_windows[val]?
TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val) TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
when /^i(_\d+_)?\d+$/ when /\Ai(_\d+_)?\d+\z/
TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
when /^-?\d+\.?\d*(e[-+]?\d+)?$/ when /\A-?\d+\.?\d*(e[-+]?\d+)?\z/
val.to_f val.to_f
when /\\ / when /\\ /
val.gsub(/\\ /, ' ') val.gsub(/\\ /, ' ')
@ -4559,7 +4559,7 @@ end
#Tk.freeze #Tk.freeze
module Tk module Tk
RELEASE_DATE = '2006-04-18'.freeze RELEASE_DATE = '2006-06-27'.freeze
autoload :AUTO_PATH, 'tk/variable' autoload :AUTO_PATH, 'tk/variable'
autoload :TCL_PACKAGE_PATH, 'tk/variable' autoload :TCL_PACKAGE_PATH, 'tk/variable'

View file

@ -4,7 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto * Oct. 24, 1997 Y. Matsumoto
*/ */
#define TCLTKLIB_RELEASE_DATE "2006-04-25" #define TCLTKLIB_RELEASE_DATE "2006-06-26"
#include "ruby.h" #include "ruby.h"
#include "rubysig.h" #include "rubysig.h"