Use TypeHelper#ruby_c_type_to_go_type instead of GoUtil.ruby_c_type_to_go_type

Author: sue445

_tools/ruby_h_to_go/lib/ruby_h_to_go.rb

@@ -13,5 +13,6 @@ module RubyHToGo
   autoload :FunctionDefinition, "ruby_h_to_go/function_definition"
   autoload :StructDefinition,   "ruby_h_to_go/struct_definition"
   autoload :TypeDefinition,     "ruby_h_to_go/type_definition"
+  autoload :TypeHelper,         "ruby_h_to_go/type_helper"
   autoload :TyperefDefinition,  "ruby_h_to_go/typeref_definition"
 end

_tools/ruby_h_to_go/lib/ruby_h_to_go/argument_definition.rb

@@ -7,6 +7,8 @@ class ArgumentDefinition
 
     def_delegators :@definition, :==, :type, :type=, :name, :name=, :pointer, :pointer=, :pointer?, :length, :length=
 
+    include TypeHelper
+
     # @param definition [RubyHeaderParser::ArgumentDefinition]
     # @param header_dir [String]
     def initialize(definition:)
@@ -33,16 +35,16 @@ def go_name
 
     # @return [String]
     def go_function_arg
-      "#{go_name} #{GoUtil.ruby_c_type_to_go_type(type, pointer:, pointer_length: length, pos: :arg)}"
+      "#{go_name} #{ruby_c_type_to_go_type(pointer:, pointer_length: length, pos: :arg)}"
     end
 
     # @return [String]
     def cast_to_cgo
       case pointer
       when :array
-        return "toCArray[#{GoUtil.ruby_c_type_to_go_type(type)}, #{GoUtil.cast_to_cgo_type(type)}](#{go_name})"
+        return "toCArray[#{ruby_c_type_to_go_type}, #{GoUtil.cast_to_cgo_type(type)}](#{go_name})"
       when :ref_array
-        return "toCArray[*#{GoUtil.ruby_c_type_to_go_type(type)}, *#{GoUtil.cast_to_cgo_type(type)}](#{go_name})"
+        return "toCArray[*#{ruby_c_type_to_go_type}, *#{GoUtil.cast_to_cgo_type(type)}](#{go_name})"
       when :sref
         return go_name if type == "void" && length == 2
 
@@ -76,7 +78,7 @@ def generate_go_arguments(char_var_count:, chars_var_count:)
           c_var_name = "c#{GoUtil.snake_to_camel(go_name)}"
 
           before_call_function_line = "var #{c_var_name} #{GoUtil.cast_to_cgo_type(type)}"
-          after_call_function_line = "*#{go_name} = #{GoUtil.ruby_c_type_to_go_type(type, pos: :arg)}(#{c_var_name})"
+          after_call_function_line = "*#{go_name} = #{ruby_c_type_to_go_type(pos: :arg)}(#{c_var_name})"
 
           ["&#{c_var_name}", [before_call_function_line], [after_call_function_line]]
         end

_tools/ruby_h_to_go/lib/ruby_h_to_go/type_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module RubyHToGo
+  # type attribute helper
+  module TypeHelper
+    # @param pos [Symbol,nil] :arg, :typeref, :return
+    # @param pointer [Symbol,nil] pointer hint (:ref, :array, :ref_array, :function, :sref, :str_array, :in_ref, :raw)
+    # @param pointer_length [Integer]
+    # @return [String]
+    def ruby_c_type_to_go_type(pos: nil, pointer: nil, pointer_length: 0)
+      GoUtil.ruby_c_type_to_go_type(type, pos:, pointer:, pointer_length:)
+    end
+  end
+end

_tools/ruby_h_to_go/lib/ruby_h_to_go/typeref_definition.rb

@@ -7,6 +7,8 @@ class TyperefDefinition
 
     def_delegators :@definition, :==, :type, :type=, :pointer, :pointer=, :pointer?
 
+    include TypeHelper
+
     # @param definition [RubyHeaderParser::TyperefDefinition]
     def initialize(definition:)
       @definition = definition
@@ -16,14 +18,14 @@ def initialize(definition:)
     def go_function_typeref
       return "" if type == "void" && !pointer?
 
-      GoUtil.ruby_c_type_to_go_type(type, pos: :typeref, pointer:)
+      ruby_c_type_to_go_type(pos: :typeref, pointer:)
     end
 
     # @return [String]
     def cast_func_for_function_return
       return "" if type == "void" && !pointer?
 
-      cast_func = GoUtil.ruby_c_type_to_go_type(type, pos: :return, pointer:)
+      cast_func = ruby_c_type_to_go_type(pos: :return, pointer:)
       return "(#{cast_func})" if cast_func.start_with?("*")
 
       cast_func