Merge pull request #161 from sue445/feature/fix_function_generator

Diet generated function line

Author: sue445

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-09-30 08:46:06 UTC using RuboCop version 1.66.1.
+# on 2024-10-03 13:07:51 UTC using RuboCop version 1.66.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,25 +9,30 @@
 # Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 79
+  Max: 81
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 48
 
-# Offense count: 7
+# Offense count: 1
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 102
+
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 15
+  Max: 16
 
-# Offense count: 15
+# Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 75
+  Max: 77
 
 # Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 16
+  Max: 17

_tools/ruby_h_to_go/lib/ruby_h_to_go/function_definition.rb

@@ -121,6 +121,8 @@ def generate_go_content
       if cast_func == ""
         go_function_lines << call_c_method
         go_function_lines.push(*after_call_function_lines)
+      elsif after_call_function_lines.empty?
+        go_function_lines << "return #{cast_func}(#{call_c_method})"
       else
         go_function_lines << "ret := #{cast_func}(#{call_c_method})"
         go_function_lines.push(*after_call_function_lines)

_tools/ruby_h_to_go/spec/ruby_h_to_go/function_definition_spec.rb

@@ -99,8 +99,7 @@
           //
           //	VALUE rb_funcallv(VALUE recv, ID mid, int argc, const VALUE *argv)
           func RbFuncallv(recv VALUE, mid ID, argc int, argv []VALUE) VALUE {
-          ret := VALUE(C.rb_funcallv(C.VALUE(recv), C.ID(mid), C.int(argc), toCArray[VALUE, C.VALUE](argv)))
-          return ret
+          return VALUE(C.rb_funcallv(C.VALUE(recv), C.ID(mid), C.int(argc), toCArray[VALUE, C.VALUE](argv)))
           }
 
         GO
@@ -130,8 +129,7 @@
           //
           //	void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1)
           func RbThreadCallWithGvl(arg1 unsafe.Pointer, data1 unsafe.Pointer) unsafe.Pointer {
-          ret := unsafe.Pointer(C.rb_thread_call_with_gvl(toCFunctionPointer(arg1), data1))
-          return ret
+          return unsafe.Pointer(C.rb_thread_call_with_gvl(toCFunctionPointer(arg1), data1))
           }
 
         GO
@@ -161,8 +159,7 @@
           //
           //	int rb_uv_to_utf8(char buf[6], unsigned long uv)
           func RbUvToUtf8(buf []Char, uv uint) int {
-          ret := int(C.rb_uv_to_utf8(toCArray[Char, C.char](buf), C.ulong(uv)))
-          return ret
+          return int(C.rb_uv_to_utf8(toCArray[Char, C.char](buf), C.ulong(uv)))
           }
 
         GO
@@ -189,8 +186,7 @@
           //
           //	int *rb_errno_ptr(void)
           func RbErrnoPtr() *Int {
-          ret := (*Int)(C.rb_errno_ptr())
-          return ret
+          return (*Int)(C.rb_errno_ptr())
           }
 
         GO
@@ -219,8 +215,7 @@
           //
           //	rb_big2ll(VALUE)
           func RbBig2Ll(arg1 VALUE) Longlong {
-          ret := Longlong(C.rb_big2ll(C.VALUE(arg1)))
-          return ret
+          return Longlong(C.rb_big2ll(C.VALUE(arg1)))
           }
 
         GO
@@ -249,8 +244,7 @@
           //
           //	rb_big2ull(VALUE)
           func RbBig2Ull(arg1 VALUE) Ulonglong {
-          ret := Ulonglong(C.rb_big2ull(C.VALUE(arg1)))
-          return ret
+          return Ulonglong(C.rb_big2ull(C.VALUE(arg1)))
           }
 
         GO
@@ -325,8 +319,7 @@
           //
           //	RSTRING_END(VALUE str)
           func RSTRING_END(str VALUE) string {
-          ret := char2String(C.RSTRING_END(C.VALUE(str)))
-          return ret
+          return char2String(C.RSTRING_END(C.VALUE(str)))
           }
 
         GO
@@ -355,8 +348,7 @@
           //
           //	VALUE rb_const_list(void*)
           func RbConstList(arg1 unsafe.Pointer) VALUE {
-          ret := VALUE(C.rb_const_list(arg1))
-          return ret
+          return VALUE(C.rb_const_list(arg1))
           }
 
         GO
@@ -389,8 +381,7 @@
           char, clean := string2Char(feature)
           defer clean()
 
-          ret := int(C.rb_feature_provided(char, (**C.char)(unsafe.Pointer(loading))))
-          return ret
+          return int(C.rb_feature_provided(char, (**C.char)(unsafe.Pointer(loading))))
           }
 
         GO
@@ -523,8 +514,7 @@
           //
           //	RSTRING_PTR(VALUE str)
           func RSTRING_PTR(str VALUE) *Char {
-          ret := (*Char)(C.RSTRING_PTR(C.VALUE(str)))
-          return ret
+          return (*Char)(C.RSTRING_PTR(C.VALUE(str)))
           }
 
         GO