[ruby-dev:10477] Re: exception on TkAfter proc

永井＠知能．九工大です．

From: [e-mail]
Subject: [ruby-dev:10440] exception on TkAfter proc
Date: Fri, 28 Jul 2000 11:14:16 +0900
Message-ID: <[e-mail]>
nagai> というわけで，例外発生時の TkAfter 動作を
nagai> 選択できるようにすべきとの結論に達しました．

特に意見も出ないようですので，長い名前にしてしまいました．(^_^;
TkAfter の修正と TkText の恥ずかしいバグ修正とのパッチを添えます．
これらについては 1.4 系，1.5 系ともに適用をお願いします．
-- 
                                         永井 秀利 （九工大 知能情報）
                                             [e-mail]

diff -urN lib.orig/tkafter.rb lib/tkafter.rb
--- lib.orig/tkafter.rb	Wed May 24 13:34:21 2000
+++ lib/tkafter.rb	Tue Aug  1 13:41:23 2000
@@ -1,6 +1,6 @@
 #
 #   tkafter.rb : methods for Tcl/Tk after command
-#                     1998/07/02 by Hidetoshi Nagai <[e-mail]>
+#                     2000/08/01 by Hidetoshi Nagai <[e-mail]>
 #
 require 'tk'
 
@@ -37,7 +37,16 @@
   ###############################
   def do_callback(*args)
     @in_callback = true
-    ret = @current_proc.call(*args)
+    begin
+      ret = @current_proc.call(*args)
+    rescue StandardError, NameError
+      if @cancel_on_exception
+	cancel
+	return nil
+      else
+	fail $!
+      end
+    end
     if @set_next
       set_next_callback(*args)
     else
@@ -118,6 +127,8 @@
     @after_id = nil
     @after_script = nil
 
+    @cancel_on_exception = true
+
     set_procs(*args) if args != []
 
     @running = false
@@ -135,7 +146,16 @@
   end
 
   def current_status
-    [@running, @current_sleep, @current_proc, @current_args, @do_loop]
+    [@running, @current_sleep, @current_proc, @current_args, 
+      @do_loop, @cancel_on_exception]
+  end
+
+  def cancel_on_exception?
+    @cancel_on_exception
+  end
+
+  def cancel_on_exception=(mode)
+    @cancel_on_exception = mode
   end
 
   def running?
diff -urN lib.orig/tktext.rb lib/tktext.rb
--- lib.orig/tktext.rb	Wed May 24 13:34:22 2000
+++ lib/tktext.rb	Tue Aug  1 13:29:19 2000
@@ -460,7 +460,7 @@
 	  when 'anchor'
 	    result.push TkTextMarkAnchor.new(self)
 	  else
-	    result.push tk_tcl2rb(val)
+	    result.push tk_tcl2ruby(val)
 	  end
 	when 'tagon'
 	  if val == 'sel'
@@ -470,12 +470,12 @@
 	      result.push TkTextTagSel.new(self)
 	    end
 	  else
-	    result.push tk_tcl2rb val
+	    result.push tk_tcl2ruby(val)
 	  end
 	when 'tagoff'
-	    result.push tk_tcl2rb sel
+	    result.push tk_tcl2ruby(sel)
 	when 'window'
-	  result.push tk_tcl2rb val
+	  result.push tk_tcl2ruby(val)
 	end
 	i = idx + 1
       end