codegen: returnWraper does not need FuncDefs arg anymore (#68)

Author: gucio321

cmd/codegen/gengo.go

@@ -435,7 +435,7 @@ import "unsafe"
 				continue
 			}
 
-			returnType, _ := returnWrapper(f)
+			returnType, _ := returnWrapper()
 
 			sb.WriteString(funcSignatureFunc(f.FuncName, args[1:], returnType))
 
@@ -479,7 +479,7 @@ import "unsafe"
 			convertedFuncCount += 1
 		default:
 			if rf, ok := returnWrapperMap[f.Ret]; ok {
-				returnType, returnStmt := rf(f)
+				returnType, returnStmt := rf()
 
 				sb.WriteString(funcSignatureFunc(f.FuncName, args, returnType))
 

cmd/codegen/return_wrapper.go

@@ -1,123 +1,123 @@
 package main
 
 // Wrapper for return value
-type returnWrapper func(f FuncDef) (returnType string, returnStmt string)
+type returnWrapper func() (returnType string, returnStmt string)
 
-func boolReturnW(f FuncDef) (returnType string, returnStmt string) {
+func boolReturnW() (returnType string, returnStmt string) {
 	returnType = "bool"
 	returnStmt = "return %s == C.bool(true)\n"
 	return
 }
 
-func constCharReturnW(f FuncDef) (returnType string, returnStmt string) {
+func constCharReturnW() (returnType string, returnStmt string) {
 	returnType = "string"
 	returnStmt = "return C.GoString(%s)"
 	return
 }
 
-func floatReturnW(f FuncDef) (returnType string, returnStmt string) {
+func floatReturnW() (returnType string, returnStmt string) {
 	returnType = "float32"
 	returnStmt = "return float32(%s)"
 	return
 }
 
-func doubleReturnW(f FuncDef) (returnType string, returnStmt string) {
+func doubleReturnW() (returnType string, returnStmt string) {
 	returnType = "float64"
 	returnStmt = "return float64(%s)"
 	return
 }
 
-func intReturnW(f FuncDef) (returnType string, returnStmt string) {
+func intReturnW() (returnType string, returnStmt string) {
 	returnType = "int"
 	returnStmt = "return int(%s)"
 	return
 }
 
-func constWCharPtrReturnW(f FuncDef) (returnType string, returnStmt string) {
+func constWCharPtrReturnW() (returnType string, returnStmt string) {
 	returnType = "*ImWchar"
 	returnStmt = "return (*ImWchar)(%s)"
 	return
 }
 
-func imVec4PtrReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imVec4PtrReturnW() (returnType string, returnStmt string) {
 	returnType = "ImVec4"
 	returnStmt = "return newImVec4FromCPtr(%s)"
 	return
 }
 
-func imVec4ReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imVec4ReturnW() (returnType string, returnStmt string) {
 	returnType = "ImVec4"
 	returnStmt = "return newImVec4FromC(%s)"
 	return
 }
 
-func imVec2ReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imVec2ReturnW() (returnType string, returnStmt string) {
 	returnType = "ImVec2"
 	returnStmt = "return newImVec2FromC(%s)"
 	return
 }
 
-func imColorReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imColorReturnW() (returnType string, returnStmt string) {
 	returnType = "ImColor"
 	returnStmt = "return newImColorFromC(%s)"
 	return
 }
 
-func imPlotPointReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imPlotPointReturnW() (returnType string, returnStmt string) {
 	returnType = "ImPlotPoint"
 	returnStmt = "return newImPlotPointFromC(%s)"
 	return
 }
 
-func imRectReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imRectReturnW() (returnType string, returnStmt string) {
 	returnType = "ImRect"
 	returnStmt = "return newImRectFromC(%s)"
 	return
 }
 
-func imTableColumnIdxReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imTableColumnIdxReturnW() (returnType string, returnStmt string) {
 	returnType = "ImGuiTableColumnIdx"
 	returnStmt = "return ImGuiTableColumnIdx(%s)"
 	return
 }
 
-func imTableDrawChannelIdxReturnW(f FuncDef) (returnType string, returnStmt string) {
+func imTableDrawChannelIdxReturnW() (returnType string, returnStmt string) {
 	returnType = "ImGuiTableDrawChannelIdx"
 	returnStmt = "return ImGuiTableDrawChannelIdx(%s)"
 	return
 }
 
-func voidPtrReturnW(f FuncDef) (returnType string, returnStmt string) {
+func voidPtrReturnW() (returnType string, returnStmt string) {
 	returnType = "unsafe.Pointer"
 	returnStmt = "return unsafe.Pointer(%s)"
 	return
 }
 
-func u32ReturnW(f FuncDef) (returnType string, returnStmt string) {
+func u32ReturnW() (returnType string, returnStmt string) {
 	returnType = "uint32"
 	returnStmt = "return uint32(%s)"
 	return
 }
 
-func uintReturnW(f FuncDef) (returnType string, returnStmt string) {
+func uintReturnW() (returnType string, returnStmt string) {
 	returnType = "uint32"
 	returnStmt = "return uint32(%s)"
 	return
 }
 
-func uint64ReturnW(f FuncDef) (returnType string, returnStmt string) {
+func uint64ReturnW() (returnType string, returnStmt string) {
 	returnType = "uint64"
 	returnStmt = "return uint64(%s)"
 	return
 }
 
-func idReturnW(f FuncDef) (returnType string, returnStmt string) {
+func idReturnW() (returnType string, returnStmt string) {
 	returnType = "ImGuiID"
 	returnStmt = "return ImGuiID(%s)"
 	return
 }
 
-func textureIdReturnW(f FuncDef) (returnType string, returnStmt string) {
+func textureIdReturnW() (returnType string, returnStmt string) {
 	returnType = "ImTextureID"
 	returnStmt = "return ImTextureID(%s)"
 	return