Define build-in types by using Kernel#define_type

gogotanaka · gogotanaka · commit 070357ff0878 · 2014-12-03T01:40:58.000-08:00
diff --git a/lib/java.rb b/lib/java.rb
@@ -47,42 +47,6 @@ def __java__
       @__java__
     end
 
-    def void(meth)
-      define_typed_method(meth, :void, NilClass)
-    end
-
-    def byte(meth)
-      define_typed_method(meth, :byte, Integer) { |rtn| ::Java::BYTE === rtn }
-    end
-
-    def short(meth)
-      define_typed_method(meth, :short, Integer) { |rtn| ::Java::SHORT === rtn }
-    end
-
-    def int(meth)
-      define_typed_method(meth, :int, Integer) { |rtn| ::Java::INT === rtn }
-    end
-
-    def long(meth)
-      define_typed_method(meth, :long, Integer) { |rtn| ::Java::LONG === rtn }
-    end
-
-    def float(meth)
-      define_typed_method(meth, :float, Float)
-    end
-
-    def double(meth)
-      define_typed_method(meth, :double, Float)
-    end
-
-    def bool(meth)
-      define_typed_method(meth, :bool, Boolean)
-    end
-
-    def char(meth)
-      define_typed_method(meth, :char, String) { |rtn| rtn.length == 1 }
-    end
-
     def define_typed_method(meth, type, type_klass, &condition)
       __java__.send(:define_method, meth) do |*args, &block|
         ::Java.assert_return_type(meth, type, type_klass, super(*args, &block), &condition)
@@ -94,3 +58,13 @@ module Boolean; end
 
 TrueClass.send(:include, Boolean)
 FalseClass.send(:include, Boolean)
+
+define_type(:void, NilClass)
+define_type(:byte, Integer) { |rtn| ::Java::BYTE === rtn }
+define_type(:short, Integer) { |rtn| ::Java::SHORT === rtn }
+define_type(:int, Integer) { |rtn| ::Java::INT === rtn }
+define_type(:long, Integer) { |rtn| ::Java::LONG === rtn }
+define_type(:float, Float)
+define_type(:double, Float)
+define_type(:bool, Boolean)
+define_type(:char, String) { |rtn| rtn.length == 1 }
