Fixed cannot use v (variable of type Int) as int value in argument to RbInt2NumInline

Author: sue445

ruby/ruby_internal_arithmetic_int.go

@@ -8,11 +8,11 @@ import "C"
 // c.f. https://github.com/ruby/ruby/blob/master/include/ruby/internal/arithmetic/int.h
 
 // NUM2INT is alias to [RbNum2intInline]
-func NUM2INT(x VALUE) Int {
+func NUM2INT(x VALUE) int {
 	return RbNum2IntInline(x)
 }
 
 // INT2NUM is alias to [RbInt2numInline]
-func INT2NUM(v Int) VALUE {
+func INT2NUM(v int) VALUE {
 	return RbInt2NumInline(v)
 }

ruby/testdata/example/ext/example/benchmark.go

@@ -16,12 +16,12 @@ import (
 //export rb_example_benchmark_tarai
 func rb_example_benchmark_tarai(_ C.VALUE, x C.VALUE, y C.VALUE, z C.VALUE) C.VALUE {
 	ret := tarai(
-		int(ruby.NUM2INT(ruby.VALUE(x))),
-		int(ruby.NUM2INT(ruby.VALUE(y))),
-		int(ruby.NUM2INT(ruby.VALUE(z))),
+		ruby.NUM2INT(ruby.VALUE(x)),
+		ruby.NUM2INT(ruby.VALUE(y)),
+		ruby.NUM2INT(ruby.VALUE(z)),
 	)
 
-	return C.VALUE(ruby.INT2NUM(ruby.Int(ret)))
+	return C.VALUE(ruby.INT2NUM(ret))
 }
 
 func tarai(x int, y int, z int) int {
@@ -35,10 +35,10 @@ func tarai(x int, y int, z int) int {
 //export rb_example_benchmark_tarai_goroutine
 func rb_example_benchmark_tarai_goroutine(_ C.VALUE, x C.VALUE, y C.VALUE, z C.VALUE, times C.VALUE) C.VALUE {
 	ret := tarai_goroutine(
-		int(ruby.NUM2INT(ruby.VALUE(x))),
-		int(ruby.NUM2INT(ruby.VALUE(y))),
-		int(ruby.NUM2INT(ruby.VALUE(z))),
-		int(ruby.NUM2INT(ruby.VALUE(times))),
+		ruby.NUM2INT(ruby.VALUE(x)),
+		ruby.NUM2INT(ruby.VALUE(y)),
+		ruby.NUM2INT(ruby.VALUE(z)),
+		ruby.NUM2INT(ruby.VALUE(times)),
 	)
 
 	var values []ruby.VALUE

ruby/testdata/example/ext/example/go_struct.go

@@ -29,17 +29,17 @@ func go_struct_alloc(klass C.VALUE) C.VALUE {
 //export rb_example_go_struct_set
 func rb_example_go_struct_set(self C.VALUE, x C.VALUE, y C.VALUE) {
 	data := (*GoStruct)(ruby.GetGoStruct(ruby.VALUE(self)))
-	data.x = int(ruby.NUM2INT(ruby.VALUE(x)))
-	data.y = int(ruby.NUM2INT(ruby.VALUE(y)))
+	data.x = ruby.NUM2INT(ruby.VALUE(x))
+	data.y = ruby.NUM2INT(ruby.VALUE(y))
 }
 
 //export rb_example_go_struct_get
 func rb_example_go_struct_get(self C.VALUE) C.VALUE {
 	data := (*GoStruct)(ruby.GetGoStruct(ruby.VALUE(self)))
 
 	ret := []ruby.VALUE{
-		ruby.INT2NUM(ruby.Int(data.x)),
-		ruby.INT2NUM(ruby.Int(data.y)),
+		ruby.INT2NUM(data.x),
+		ruby.INT2NUM(data.y),
 	}
 
 	return C.VALUE(ruby.Slice2rbAry(ret))