----Next_Part(Thu_Feb_12_00:45:02_2004_571)--
Content-Type: Multipart/Mixed;
boundary="--Next_Part(Thu_Feb_12_00:45:02_2004_571)--"
----Next_Part(Thu_Feb_12_00:45:02_2004_571)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Hidetoshi NAGAI <
[email protected]>
Subject: Re: TkEntry with { (left brace) characters
Date: Thu, 12 Feb 2004 00:41:03 +0900
Message-ID: said:
I committed the following patch to CVS head.
Sorry. I forgot to attach the patch.
--
Hidetoshi NAGAI (
[email protected])
----Next_Part(Thu_Feb_12_00:45:02_2004_571)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="tk.rb-diff"
Index: tk.rb
===================================================================
RCS file: /src/ruby/ext/tk/lib/tk.rb,v
retrieving revision 1.104
diff -u -r1.104 tk.rb
--- tk.rb 13 Jan 2004 07:52:03 -0000 1.104
+++ tk.rb 11 Feb 2004 14:21:30 -0000
@@ -1,6 +1,6 @@
#
# tk.rb - Tk interface module using tcltklib
-# $Date: 2004/01/13 07:52:03 $
+# $Date: 2004/01/07 05:28:53 $
# by Yukihiro Matsumoto <
[email protected]>
# use Shigehiro's tcltklib
@@ -87,9 +87,9 @@
#return Tk_CMDTBL[$1]
return TkCore::INTERP.tk_cmd_tbl[$1]
end
- if val.include? ?\s
- return val.split.collect{|v| tk_tcl2ruby(v)}
- end
+ #if val.include? ?\s
+ # return val.split.collect{|v| tk_tcl2ruby(v)}
+ #end
case val
when /^@font/
TkFont.get_obj(val)
@@ -101,12 +101,14 @@
TkCore::INTERP.tk_windows[val] : _genobj_for_tkwidget(val)
when /^i\d+$/
TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
- when / /
+ when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+ val.to_f
+ when /[^\\] /
val.split.collect{|elt|
tk_tcl2ruby(elt)
}
- when /^-?\d+\.?\d*(e[-+]?\d+)?$/
- val.to_f
+ when /\\ /
+ val.gsub(/\\ /, ' ')
else
val
end
@@ -114,6 +116,37 @@
def tk_split_list(str)
return [] if str == ""
+ list = []
+ token = nil
+ escape = false
+ brace = 0
+ str.split('').each {|c|
+ if c == '\\' && !escape
+ escape = true
+ token = (token || "") << c
+ next
+ end
+ brace += 1 if c == '{' && !escape
+ brace -= 1 if c == '}' && !escape
+ if brace == 0 && c == ' ' && !escape
+ list << token.gsub(/^\{(.*)\}$/, '\1') if token
+ token = nil
+ else
+ token = (token || "") << c
+ end
+ escape = false
+ }
+ list << token.gsub(/^\{(.*)\}$/, '\1') if token
+
+ if list.size == 1
+ tk_tcl2ruby(list[0].gsub(/\\(\{|})/, '\1'))
+ else
+ list.collect{|token| tk_split_list(token)}
+ end
+ end
+=begin
+ def tk_split_list(str)
+ return [] if str == ""
idx = str.index('{')
while idx and idx > 0 and str[idx-1] == ?\\
idx = str.index('{', idx+1)
@@ -130,11 +163,13 @@
list = [] if list == ""
str = str[idx+1..-1]
i = -1
+ escape = false
brace = 1
str.each_byte {|c|
i += 1
- brace += 1 if c == ?{
- brace -= 1 if c == ?}
+ brace += 1 if c == ?{ && !escape
+ brace -= 1 if c == ?} && !escape
+ escape = (c == ?\\)
break if brace == 0
}
if str.size == i + 1
@@ -148,9 +183,35 @@
list += tk_split_list(str[i+1..-1])
list
end
+=end
def tk_split_simplelist(str)
return [] if str == ""
+ list = []
+ token = nil
+ escape = false
+ brace = 0
+ str.split('').each {|c|
+ if c == '\\' && !escape
+ escape = true
+ next
+ end
+ brace += 1 if c == '{' && !escape
+ brace -= 1 if c == '}' && !escape
+ if brace == 0 && c == ' ' && !escape
+ list << token.gsub(/^\{(.*)\}$/, '\1') if token
+ token = nil
+ else
+ token = (token || "") << c
+ end
+ escape = false
+ }
+ list << token.gsub(/^\{(.*)\}$/, '\1') if token
+ list
+ end
+=begin
+ def tk_split_simplelist(str)
+ return [] if str == ""
idx = str.index('{')
while idx and idx > 0 and str[idx-1] == ?\\
idx = str.index('{', idx+1)
@@ -160,11 +221,13 @@
list = str[0,idx].split
str = str[idx+1..-1]
i = -1
+ escape = false
brace = 1
str.each_byte {|c|
i += 1
- brace += 1 if c == ?{
- brace -= 1 if c == ?}
+ brace += 1 if c == ?{ && !escape
+ brace -= 1 if c == ?} && !escape
+ escape = (c == ?\\)
break if brace == 0
}
if i == 0
@@ -172,11 +235,14 @@
elsif str[0, i] == ' '
list.push ' '
else
- list.push str[0..i-1]
+ #list.push str[0..i-1]
+ list.push(str[0..i-1].gsub(/\\(\{|})/, '\1'))
end
list += tk_split_simplelist(str[i+1..-1])
list
end
+=end
+
private :tk_tcl2ruby, :tk_split_list, :tk_split_simplelist
def _symbolkey2str(keys)
@@ -236,7 +302,7 @@
def string(val)
if val == "{}"
''
- elsif val[0] == ?{
+ elsif val[0] == ?{ && val[-1] == ?}
val[1..-2]
else
val
@@ -748,6 +814,7 @@
end
INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
+ regsub -all {\\} $args {\\\\} args
regsub -all {!} $args {\\!} args
regsub -all "{" $args "\\{" args
if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
@@ -897,7 +964,8 @@
end
def rb_appsend(interp, async, *args)
- args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+ #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+ args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
args.push(').to_s"')
appsend(interp, async, 'ruby "(', *args)
end
@@ -912,7 +980,8 @@
end
def rb_appsend_displayof(interp, win, async, *args)
- args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+ #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+ args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
args.push(').to_s"')
appsend_displayof(interp, win, async, 'ruby "(', *args)
end
@@ -1550,7 +1619,8 @@
@@enc_buf = '__rb_encoding_buffer__'
def self.tk_escape(str)
- s = '"' + str.gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + str.gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + str.gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
TkCore::INTERP.__eval(Kernel.format('global %s; set %s %s',
@@enc_buf, @@enc_buf, s))
end
@@ -1859,23 +1929,30 @@
# val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
# s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
val.each_with_index{|e,i| a.push(i); a.push(e)}
- s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + array2tk_list(a).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
elsif val.kind_of?(Hash)
+ #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+ # .gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
- .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
else
- s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(format('global %s; set %s %s', @id, @id, s))
end
=end
if val.kind_of?(Hash)
+ #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+ # .gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
- .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; array set %s %s', @id, @id, s))
else
- s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
end
end
@@ -1933,7 +2010,8 @@
def value=(val)
begin
- s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
rescue
if INTERP._eval(Kernel.format('global %s; array exists %s',
@@ -1945,12 +2023,15 @@
elsif val.kind_of?(Array)
a = []
val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
- s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ #s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@id, @id, @id, s))
elsif val.kind_of?(Hash)
+ #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+ # .gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
- .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+ .gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@id, @id, @id, s))
else
@@ -1993,7 +2074,8 @@
end
def to_s
- string(value).to_s
+ #string(value).to_s
+ value
end
def to_sym
@@ -2302,7 +2384,8 @@
@id = varname
TkVar_ID_TBL[@id] = self
if val
- s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
+ #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
+ s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"' #"
INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
end
end
----Next_Part(Thu_Feb_12_00:45:02_2004_571)----
----Next_Part(Thu_Feb_12_00:45:02_2004_571)----