From: Koji Arai <JCA02266@...>
Date: 2000-05-24T02:49:59+09:00
Subject: [ruby-dev:9802] [ruby/tk] filter -> collect!

新井です。

>>> From: matz@netlab.co.jp (Yukihiro Matsumoto)
>>> Date: 19 May 2000 14:12:11 +0900
>>> Subject: [ruby-dev:9765] Re: date2.rb and cal.rb

> まつもと ゆきひろです

> |Hirofumi.Watanabe> なぜか tk に集中してますね.
> |
> |う゛;;;^_^;;;
> |すみません．修正します．
> |急ぎますか？
> 
> そんなに緊急のことではないですが、単なる文字列置換ですから、
> 1.5系は私がやっておきます。永井さんは時間のあるときに手元の
> を直しておいてください。

私、既にやってましたので。パッチつけます。(って遅い？)

# 昔、Tk::Scrollable に移動した。xview/yview も消してますな。


Index: ext/tk/lib/tk.rb
===================================================================
RCS file: /home/cvs/ruby/ext/tk/lib/tk.rb,v
retrieving revision 1.11
diff -u -p -u -r1.11 tk.rb
--- ext/tk/lib/tk.rb	2000/04/10 06:05:19	1.11
+++ ext/tk/lib/tk.rb	2000/05/23 17:41:39
@@ -470,7 +470,7 @@ module TkCore
   end
 
   def rb_appsend(interp, async, *args)
-    args = args.filter{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
+    args.collect!{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend(interp, async, 'ruby "(', *args)
   end
@@ -485,7 +485,7 @@ module TkCore
   end
 
   def rb_appsend_displayof(interp, win, async, *args)
-    args = args.filter{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
+    args.collect!{|c| _get_eval_string(c).gsub(/[][$"]/, '\\\\\&')}
     args.push(').to_s"')
     appsend_displayof(interp, win, async, 'ruby "(', *args)
   end
@@ -526,7 +526,7 @@ module TkCore
 
   def tk_call(*args)
     print args.join(" "), "\n" if $DEBUG
-    args.filter {|x|_get_eval_string(x)}
+    args.collect! {|x|_get_eval_string(x)}
     args.compact!
     args.flatten!
     begin
Index: ext/tk/lib/tkafter.rb
===================================================================
RCS file: /home/cvs/ruby/ext/tk/lib/tkafter.rb,v
retrieving revision 1.2
diff -u -p -u -r1.2 tkafter.rb
--- ext/tk/lib/tkafter.rb	1999/08/13 05:37:51	1.2
+++ ext/tk/lib/tkafter.rb	2000/05/23 17:41:40
@@ -26,7 +26,7 @@ class TkAfter
   end
 
   def TkAfter.info
-    tk_call('after', 'info').split(' ').filter{|id|
+    tk_call('after', 'info').split(' ').collect!{|id|
       ret = Tk_CBTBL.find{|key,val| val.after_id == id}
       (ret == nil)? id: ret[1]
     }
Index: ext/tk/lib/tkcanvas.rb
===================================================================
RCS file: /home/cvs/ruby/ext/tk/lib/tkcanvas.rb,v
retrieving revision 1.6
diff -u -p -u -r1.6 tkcanvas.rb
--- ext/tk/lib/tkcanvas.rb	2000/01/17 08:37:51	1.6
+++ ext/tk/lib/tkcanvas.rb	2000/05/23 17:41:41
@@ -216,7 +216,7 @@ class TkCanvas<TkWindow
   end
 
   def find(mode, *args)
-    list(tk_send 'find', mode, *args).filter{|id| 
+    list(tk_send 'find', mode, *args).collect!{|id| 
       TkcItem.id2obj(id)
     }
   end
@@ -368,13 +368,6 @@ class TkCanvas<TkWindow
   def itemtype(tag)
     TkcItem.type2class(tk_send 'type', tagid(tag))
   end
-
-  def xview(*index)
-    tk_send 'xview', *index
-  end
-  def yview(*index)
-    tk_send 'yview', *index
-  end
 end
 
 module TkcTagAccess
@@ -725,7 +718,7 @@ class TkImage<TkObject
   end
 
   def TkImage.names
-    Tk.tk_call('image', 'names').split.filter{|id|
+    Tk.tk_call('image', 'names').split.collect!{|id|
       (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
     }
   end
Index: ext/tk/lib/tktext.rb
===================================================================
RCS file: /home/cvs/ruby/ext/tk/lib/tktext.rb,v
retrieving revision 1.9
diff -u -p -u -r1.9 tktext.rb
--- ext/tk/lib/tktext.rb	2000/05/01 09:41:37	1.9
+++ ext/tk/lib/tktext.rb	2000/05/23 17:41:42
@@ -245,16 +245,10 @@ class TkText<TkTextWin
     (inf == "")?  [0,0,0,0,0]: inf
   end
 
-  def yview(*what)
-    tk_send 'yview', *what
-  end
   def yview_pickplace(*what)
     tk_send 'yview', '-pickplace', *what
   end
 
-  def xview(*what)
-    tk_send 'xview', *what
-  end
   def xview_pickplace(*what)
     tk_send 'xview', '-pickplace', *what
   end
Index: ext/tk/lib/tkvirtevent.rb
===================================================================
RCS file: /home/cvs/ruby/ext/tk/lib/tkvirtevent.rb,v
retrieving revision 1.2
diff -u -p -u -r1.2 tkvirtevent.rb
--- ext/tk/lib/tkvirtevent.rb	1999/08/13 05:37:52	1.2
+++ ext/tk/lib/tkvirtevent.rb	2000/05/23 17:41:42
@@ -16,7 +16,7 @@ class TkVirtualEvent<TkObject
   end
 
   def TkVirtualEvent.info
-    tk_call('event', 'info').split(/\s+/).filter{|seq|
+    tk_call('event', 'info').split(/\s+/).collect!{|seq|
       TkVirtualEvent.getobj(seq[1..-2])
     }
   end
@@ -49,8 +49,8 @@ class TkVirtualEvent<TkObject
   end
 
   def info
-    tk_call('event', 'info', "<#{@id}>").split(/\s+/).filter{|seq|
-      l = seq.scan(/<*[^<>]+>*/).filter{|subseq|
+    tk_call('event', 'info', "<#{@id}>").split(/\s+/).collect!{|seq|
+      l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
 	case (subseq)
 	when /^<<[^<>]+>>$/
 	  TkVirtualEvent.getobj(subseq[1..-2])