ngoto	2012-12-12 00:24:31 +0900 (Wed, 12 Dec 2012)

  New Revision: 38324

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38324

  Log:
    * ext/dl/lib/dl/func.rb (DL::Function#unbind, #bound?): suppress NoMethodError when Fiddle is available. [ruby-core:50756] [Bug #7543]
    * test/dl/test_func.rb (test_bound*, test_unbind*): tests for the above.

  Modified files:
    trunk/ChangeLog
    trunk/ext/dl/lib/dl/func.rb
    trunk/test/dl/test_func.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38323)
+++ ChangeLog	(revision 38324)
@@ -1,3 +1,9 @@
+Wed Dec 12 00:13:34 2012  Naohisa Goto  <ngotogenome@g...>
+
+	* ext/dl/lib/dl/func.rb (DL::Function#unbind, #bound?): suppress
+	  NoMethodError when Fiddle is available. [ruby-core:50756] [Bug #7543]
+	* test/dl/test_func.rb (test_bound*, test_unbind*): tests for the above.
+
 Tue Dec 11 19:38:37 2012  Naohisa Goto  <ngotogenome@g...>
 
 	* ext/fiddle/function.c (Fiddle::Function.new): new keyword argument
Index: ext/dl/lib/dl/func.rb
===================================================================
--- ext/dl/lib/dl/func.rb	(revision 38323)
+++ ext/dl/lib/dl/func.rb	(revision 38324)
@@ -36,6 +36,9 @@
         def name
           @name
         end
+        def ptr
+          to_i
+        end
       end
       private_constant :FiddleClosureCFunc
 
@@ -157,6 +160,25 @@
     end
 
     def unbind()
+      if DL.fiddle? then
+        if @cfunc.kind_of?(Fiddle::Closure) and @cfunc.ptr != 0 then
+          call_type = case abi
+                      when CALL_TYPE_TO_ABI[nil]
+                        nil
+                      when CALL_TYPE_TO_ABI[:stdcall]
+                        :stdcall
+                      else
+                        raise(RuntimeError, "unsupported abi: #{abi}")
+                      end
+          @cfunc = CFunc.new(0, @cfunc.ctype, name, call_type)
+          return 0
+        elsif @cfunc.ptr != 0 then
+          @cfunc.ptr = 0
+          return 0
+        else
+          return nil
+        end
+      end
       if( @cfunc.ptr != 0 )
         case @cfunc.calltype
         when :cdecl
Index: test/dl/test_func.rb
===================================================================
--- test/dl/test_func.rb	(revision 38323)
+++ test/dl/test_func.rb	(revision 38324)
@@ -15,6 +15,49 @@
       assert_equal('<callback>qsort', cb.name)
     end
 
+    def test_bound
+      f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
+      assert_equal false, f.bound?
+      begin
+        f.bind { |x,y| x + y }
+        assert_equal true, f.bound?
+      ensure
+        f.unbind # max number of callbacks is limited to MAX_CALLBACK
+      end
+    end
+
+    def test_bound_for_callback_closure
+      begin
+        f = Function.new(CFunc.new(0, TYPE_INT, 'test'),
+                         [TYPE_INT, TYPE_INT]) { |x,y| x + y }
+        assert_equal true, f.bound?
+      ensure
+        f.unbind if f # max number of callbacks is limited to MAX_CALLBACK
+      end
+    end
+
+    def test_unbind
+      f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
+      begin
+        f.bind { |x, y| x + y }
+        assert_nothing_raised { f.unbind }
+        assert_equal false, f.bound?
+        # unbind() after unbind() should not raise error
+        assert_nothing_raised { f.unbind }
+      ensure
+        f.unbind # max number of callbacks is limited to MAX_CALLBACK
+      end
+    end
+
+    def test_unbind_normal_function
+      f = Function.new(CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy'),
+                       [TYPE_VOIDP, TYPE_VOIDP])
+      assert_nothing_raised { f.unbind }
+      assert_equal false, f.bound?
+      # unbind() after unbind() should not raise error
+      assert_nothing_raised { f.unbind }
+    end
+
     def test_bind
       f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
       assert_nothing_raised {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/