summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-04 14:21:24 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-04 14:21:24 +0000
commitba9543cf7d2e200f12e242aeace8344fce07e10c (patch)
tree8fe1e1d27b539aa36f3e66d25ec660c6c6ed395d /ext
parent0d4192efc2a06c6e29a8a275b5565d5d416f4598 (diff)
downloadruby-ba9543cf7d2e200f12e242aeace8344fce07e10c.tar.gz
ruby-ba9543cf7d2e200f12e242aeace8344fce07e10c.tar.xz
ruby-ba9543cf7d2e200f12e242aeace8344fce07e10c.zip
* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
decide whether convert encoding of each element or not. * ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the encoding of array elements when assign an array to an TkVariable object. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/lib/tk.rb18
-rw-r--r--ext/tk/lib/tk/variable.rb8
2 files changed, 13 insertions, 13 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 500fa2153..77ca443cf 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -287,19 +287,19 @@ if USE_TCLs_LIST_FUNCTIONS
TkCore::INTERP._split_tklist(str)
end
- def array2tk_list(ary)
+ def array2tk_list(ary, enc=nil)
return "" if ary.size == 0
dst = ary.collect{|e|
if e.kind_of? Array
- array2tk_list(e)
+ array2tk_list(e, enc)
elsif e.kind_of? Hash
tmp_ary = []
#e.each{|k,v| tmp_ary << k << v }
e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
- array2tk_list(tmp_ary)
+ array2tk_list(tmp_ary, enc)
else
- _get_eval_string(e)
+ _get_eval_string(e, enc)
end
}
TkCore::INTERP._merge_tklist(*dst)
@@ -422,16 +422,16 @@ else
list
end
- def array2tk_list(ary)
+ def array2tk_list(ary, enc=nil)
ary.collect{|e|
if e.kind_of? Array
- "{#{array2tk_list(e)}}"
+ "{#{array2tk_list(e, enc)}}"
elsif e.kind_of? Hash
# "{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
- array2tk_list(tmp_ary)
+ array2tk_list(tmp_ary, enc)
else
- s = _get_eval_string(e)
+ s = _get_eval_string(e, enc)
(s.index(/\s/) || s.size == 0)? "{#{s}}": s
end
}.join(" ")
@@ -3120,7 +3120,7 @@ module TkConfigMethod
when /^(#{__strval_optkeys.join('|')})$/
conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
else
- conf = tk_split_list(_fromUTF8(tk_send_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+ conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
end
conf[__configinfo_struct[:key]] =
conf[__configinfo_struct[:key]][1..-1]
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
index cdf6441b6..b5059862f 100644
--- a/ext/tk/lib/tk/variable.rb
+++ b/ext/tk/lib/tk/variable.rb
@@ -468,7 +468,7 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
_get_eval_string(v, true))
}
self.value
- elsif val.kind_of?(Array)
+# elsif val.kind_of?(Array)
=begin
INTERP._set_global_var(@id, '')
val.each{|v|
@@ -481,7 +481,7 @@ if USE_TCLs_SET_VARIABLE_FUNCTIONS
}
self.value
=end
- _fromUTF8(INTERP._set_global_var(@id, array2tk_list(val)))
+# _fromUTF8(INTERP._set_global_var(@id, array2tk_list(val, true)))
else
#_fromUTF8(INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val))))
_fromUTF8(INTERP._set_global_var(@id, _get_eval_string(val, true)))
@@ -576,7 +576,7 @@ else
#INTERP._invoke_without_enc('unset', @id+'(0)')
elsif val.kind_of?(Array)
a = []
- val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
+ val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e, true))}
#s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
s = '"' + a.join(" ").gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@@ -588,7 +588,7 @@ else
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(" ")\
+ s = '"' + val.to_a.collect{|e| array2tk_list(e, true)}.join(" ")\
.gsub(/[\[\]$\\"]/, '\\\\\&') + '"'
INTERP._eval(Kernel.format('global %s; unset %s; array set %s %s',
@id, @id, @id, s))