Merge pull request #157 from sue445/feature/refactor

Refactor

Author: sue445

_tools/ruby_h_to_go/lib/ruby_h_to_go/argument_definition.rb

@@ -20,7 +20,7 @@ def initialize(definition:)
       "var"   => "v",
       "func"  => "fun",
       "range" => "r",
-      "type"  => "r",
+      "type"  => "t",
 
       # Can't use "_" as a value
       "_"     => "arg",

_tools/ruby_h_to_go/lib/ruby_h_to_go/generator_helper.rb

@@ -56,7 +56,7 @@ def ruby_c_type_to_go_type(typename, pos: nil, pointer: nil, pointer_length: 0)
         return "Longlong"
       when "unsigned long long"
         return "Ulonglong"
-      when /^VALUE\s*\(\*func\)\s*\(ANYARGS\)$/, "RUBY_DATA_FUNC", "rb_alloc_func_t"
+      when "RUBY_DATA_FUNC", "rb_alloc_func_t"
         return "unsafe.Pointer"
       when /^[A-Z]+$/, "int"
         # e.g. VALUE
@@ -95,7 +95,7 @@ def cast_to_cgo_type(typename)
         return "C.enum_ruby_value_type"
       when "rb_io_wait_readwrite"
         return "C.enum_rb_io_wait_readwrite"
-      when /^VALUE\s*\(\*func\)\s*\(ANYARGS\)$/, "RUBY_DATA_FUNC"
+      when "RUBY_DATA_FUNC"
         return "toCFunctionPointer"
       end
 

_tools/ruby_h_to_go/spec/ruby_h_to_go/function_definition_spec.rb

@@ -457,10 +457,10 @@
           // Original definition is following
           //
           //	rb_data_typed_object_make(VALUE klass, const rb_data_type_t *type, void **datap, size_t size)
-          func RbDataTypedObjectMake(klass VALUE, r *RbDataTypeT, datap *unsafe.Pointer, size SizeT) VALUE {
-          var cR C.rb_data_type_t
-          ret := VALUE(C.rb_data_typed_object_make(C.VALUE(klass), &cR, datap, C.size_t(size)))
-          *r = RbDataTypeT(cR)
+          func RbDataTypedObjectMake(klass VALUE, t *RbDataTypeT, datap *unsafe.Pointer, size SizeT) VALUE {
+          var cT C.rb_data_type_t
+          ret := VALUE(C.rb_data_typed_object_make(C.VALUE(klass), &cT, datap, C.size_t(size)))
+          *t = RbDataTypeT(cT)
           return ret
           }