Skip to content

Commit 5bcf27b

Browse files
committed
Use before_call_function_lines instead of go_function_lines if args generator
1 parent 653cc6d commit 5bcf27b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

_tools/ruby_h_to_go/lib/ruby_h_to_go/function_definition.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def generate_go_content
7575
clean_var_name = "clean"
7676
end
7777

78-
go_function_lines << "#{chars_var_name}, #{clean_var_name} := string2Char(#{c_arg.go_name})"
79-
go_function_lines << "defer #{clean_var_name}()"
80-
go_function_lines << ""
78+
before_call_function_lines << "#{chars_var_name}, #{clean_var_name} := string2Char(#{c_arg.go_name})"
79+
before_call_function_lines << "defer #{clean_var_name}()"
80+
before_call_function_lines << ""
8181

8282
casted_go_args << chars_var_name.to_s
8383
when "void"
@@ -103,9 +103,9 @@ def generate_go_content
103103
clean_var_name = "cleanChars"
104104
end
105105

106-
go_function_lines << "#{chars_var_name}, #{clean_var_name} := strings2Chars(#{c_arg.go_name})"
107-
go_function_lines << "defer #{clean_var_name}()"
108-
go_function_lines << ""
106+
before_call_function_lines << "#{chars_var_name}, #{clean_var_name} := strings2Chars(#{c_arg.go_name})"
107+
before_call_function_lines << "defer #{clean_var_name}()"
108+
before_call_function_lines << ""
109109

110110
casted_go_args << chars_var_name
111111
else

_tools/ruby_h_to_go/spec/ruby_h_to_go/function_definition_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@
284284
//
285285
// rb_scan_args_set(int kw_flag, int argc, const VALUE *argv,
286286
func RbScanArgsSet(kw_flag int, argc int, argv *VALUE, n_lead int, n_opt int, n_trail int, f_var Bool, f_hash Bool, f_block Bool, vars []*VALUE, fmt string, varc int) int {
287+
var cArgv C.VALUE
287288
char, clean := string2Char(fmt)
288289
defer clean()
289290
290-
var cArgv C.VALUE
291291
ret := int(C.rb_scan_args_set(C.int(kw_flag), C.int(argc), &cArgv, C.int(n_lead), C.int(n_opt), C.int(n_trail), C._Bool(f_var), C._Bool(f_hash), C._Bool(f_block), toCArray[*VALUE, *C.VALUE](vars), char, C.int(varc)))
292292
*argv = VALUE(cArgv)
293293
return ret
@@ -411,10 +411,10 @@
411411
//
412412
// int rb_find_file_ext(VALUE *feature, const char *const *exts)
413413
func RbFindFileExt(feature *VALUE, exts []string) int {
414+
var cFeature C.VALUE
414415
chars, cleanChars := strings2Chars(exts)
415416
defer cleanChars()
416417
417-
var cFeature C.VALUE
418418
ret := int(C.rb_find_file_ext(&cFeature, chars))
419419
*feature = VALUE(cFeature)
420420
return ret

ruby/function_generated.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)