akr	2013-04-02 06:49:55 +0900 (Tue, 02 Apr 2013)

  New Revision: 40044

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

  Log:
    * ext/-test-/num2int/num2int.c: Rename utility methods
      to global functions to ease manual experiments.
    
    * test/-ext-/num2int/test_num2int.rb: Follow the above change.

  Modified files:
    trunk/ChangeLog
    trunk/ext/-test-/num2int/num2int.c
    trunk/test/-ext-/num2int/test_num2int.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40043)
+++ ChangeLog	(revision 40044)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Apr  2 06:46:59 2013  Tanaka Akira  <akr@f...>
+
+	* ext/-test-/num2int/num2int.c: Rename utility methods
+	  to global functions to ease manual experiments.
+
+	* test/-ext-/num2int/test_num2int.rb: Follow the above change.
+
 Mon Apr  1 22:26:17 2013  Tanaka Akira  <akr@f...>
 
 	* ext/zlib/zlib.c (rb_gzfile_set_mtime): Use NUM2UINT.
Index: ext/-test-/num2int/num2int.c
===================================================================
--- ext/-test-/num2int/num2int.c	(revision 40043)
+++ ext/-test-/num2int/num2int.c	(revision 40044)
@@ -109,28 +109,26 @@ test_fix2ulong(VALUE obj, VALUE num) https://github.com/ruby/ruby/blob/trunk/ext/-test-/num2int/num2int.c#L109
 void
 Init_num2int(void)
 {
-    VALUE cNum2int = rb_path2class("TestNum2int::Num2int");
+    rb_define_global_function("NUM2SHORT", test_num2short, 1);
+    rb_define_global_function("NUM2USHORT", test_num2ushort, 1);
 
-    rb_define_singleton_method(cNum2int, "rb_num2short", test_num2short, 1);
-    rb_define_singleton_method(cNum2int, "rb_num2ushort", test_num2ushort, 1);
+    rb_define_global_function("NUM2INT", test_num2int, 1);
+    rb_define_global_function("NUM2UINT", test_num2uint, 1);
 
-    rb_define_singleton_method(cNum2int, "rb_num2int", test_num2int, 1);
-    rb_define_singleton_method(cNum2int, "rb_num2uint", test_num2uint, 1);
-
-    rb_define_singleton_method(cNum2int, "rb_num2long", test_num2long, 1);
-    rb_define_singleton_method(cNum2int, "rb_num2ulong", test_num2ulong, 1);
+    rb_define_global_function("NUM2LONG", test_num2long, 1);
+    rb_define_global_function("NUM2ULONG", test_num2ulong, 1);
 
 #ifdef HAVE_LONG_LONG
-    rb_define_singleton_method(cNum2int, "rb_num2ll", test_num2ll, 1);
-    rb_define_singleton_method(cNum2int, "rb_num2ull", test_num2ull, 1);
+    rb_define_global_function("NUM2LL", test_num2ll, 1);
+    rb_define_global_function("NUM2ULL", test_num2ull, 1);
 #endif
 
-    rb_define_singleton_method(cNum2int, "rb_fix2short", test_fix2short, 1);
+    rb_define_global_function("FIX2SHORT", test_fix2short, 1);
 
-    rb_define_singleton_method(cNum2int, "rb_fix2int", test_fix2int, 1);
-    rb_define_singleton_method(cNum2int, "rb_fix2uint", test_fix2uint, 1);
+    rb_define_global_function("FIX2INT", test_fix2int, 1);
+    rb_define_global_function("FIX2UINT", test_fix2uint, 1);
 
-    rb_define_singleton_method(cNum2int, "rb_fix2long", test_fix2long, 1);
-    rb_define_singleton_method(cNum2int, "rb_fix2ulong", test_fix2ulong, 1);
+    rb_define_global_function("FIX2LONG", test_fix2long, 1);
+    rb_define_global_function("FIX2ULONG", test_fix2ulong, 1);
 }
 
Index: test/-ext-/num2int/test_num2int.rb
===================================================================
--- test/-ext-/num2int/test_num2int.rb	(revision 40043)
+++ test/-ext-/num2int/test_num2int.rb	(revision 40044)
@@ -37,10 +37,9 @@ class TestNum2int < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/num2int/test_num2int.rb#L37
 
   def assert_num2i_success_internal(exp, func, arg)
     mesg = "#{func}(#{arg.inspect})"
-    method = "rb_#{func}".downcase
     out = nil
     assert_nothing_raised(mesg) {
-      out = Num2int.send(method, arg)
+      out = Kernel.send(func, arg)
     }
     assert_equal(exp, out, mesg)
   end
@@ -64,9 +63,8 @@ class TestNum2int < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/num2int/test_num2int.rb#L63
   end
 
   def assert_num2i_error_internal(func, arg)
-    method = "rb_#{func}".downcase
     assert_raise(RangeError, "#{func}(#{arg.inspect})") {
-      Num2int.send(method, arg)
+      Kernel.send(func, arg)
     }
   end
 
@@ -90,10 +88,9 @@ class TestNum2int < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/num2int/test_num2int.rb#L88
 
   def assert_fix2i_success_internal(exp, func, arg)
     mesg = "#{func}(#{arg.inspect})"
-    method = "rb_#{func}".downcase
     out = nil
     assert_nothing_raised(mesg) {
-      out = Num2int.send(method, arg)
+      out = Kernel.send(func, arg)
     }
     assert_equal(exp, out, mesg)
   end
@@ -105,9 +102,8 @@ class TestNum2int < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/-ext-/num2int/test_num2int.rb#L102
   end
 
   def assert_fix2i_error_internal(func, arg)
-    method = "rb_#{func}".downcase
     assert_raise(RangeError, "#{func}(#{arg.inspect})") {
-      Num2int.send(method, arg)
+      Kernel.send(func, arg)
     }
   end
 

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