Skip to content

Reorder pkg #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gucio321 merged 5 commits into from
Oct 28, 2024
Merged

Reorder pkg #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
479a43a
package: move functions:
gucio321 Oct 28, 2024
df01441
codegen: update code for new package layout
gucio321 Oct 28, 2024
0e535fe
manually-writen files: update for new pkg layout
gucio321 Oct 28, 2024
7a976ba
regenerate code
gucio321 Oct 28, 2024
b5fe11f
internal: split into files
gucio321 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/glfwbackend/glfw_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ void igGLFWWindow_SetWindowPos(GLFWwindow *window, int x, int y) { glfwSetWindow

void igGLFWWindow_GetWindowPos(GLFWwindow *window, int *x, int *y) { glfwGetWindowPos(window, x, y); }

void igGLFWWindow_SetShouldClose(GLFWwindow *window, int value) { glfwSetWindowShouldClose(window, value); }
void igGLFWWindow_SetShouldClose(GLFWwindow *window, bool value) { glfwSetWindowShouldClose(window, value); }

void igGLFWWindow_SetDropCallbackCB(GLFWwindow *wnd) { glfwSetDropCallback(wnd, (GLFWdropfun)dropCallback); }
void igGLFWWindow_SetKeyCallback(GLFWwindow *wnd) { glfwSetKeyCallback(wnd, (GLFWkeyfun)keyCallback); }
Expand Down
20 changes: 10 additions & 10 deletions backend/glfwbackend/glfw_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"unsafe"

"github.com/AllenDang/cimgui-go/backend"
"github.com/AllenDang/cimgui-go/datautils"
"github.com/AllenDang/cimgui-go/imgui"
"github.com/AllenDang/cimgui-go/internal"
)

type voidCallbackFunc func()
Expand Down Expand Up @@ -281,10 +281,10 @@ func (b *GLFWBackend) SetWindowPos(x, y int) {
}

func (b *GLFWBackend) GetWindowPos() (x, y int32) {
xArg, xFin := datautils.WrapNumberPtr[C.int, int32](&x)
xArg, xFin := internal.WrapNumberPtr[C.int, int32](&x)
defer xFin()

yArg, yFin := datautils.WrapNumberPtr[C.int, int32](&y)
yArg, yFin := internal.WrapNumberPtr[C.int, int32](&y)
defer yFin()

C.igGLFWWindow_GetWindowPos(b.handle(), xArg, yArg)
Expand All @@ -297,10 +297,10 @@ func (b *GLFWBackend) SetWindowSize(width, height int) {
}

func (b *GLFWBackend) DisplaySize() (width int32, height int32) {
widthArg, widthFin := datautils.WrapNumberPtr[C.int, int32](&width)
widthArg, widthFin := internal.WrapNumberPtr[C.int, int32](&width)
defer widthFin()

heightArg, heightFin := datautils.WrapNumberPtr[C.int, int32](&height)
heightArg, heightFin := internal.WrapNumberPtr[C.int, int32](&height)
defer heightFin()

C.igGLFWWindow_GetDisplaySize(b.handle(), widthArg, heightArg)
Expand All @@ -309,10 +309,10 @@ func (b *GLFWBackend) DisplaySize() (width int32, height int32) {
}

func (b *GLFWBackend) ContentScale() (width, height float32) {
widthArg, widthFin := datautils.WrapNumberPtr[C.float, float32](&width)
widthArg, widthFin := internal.WrapNumberPtr[C.float, float32](&width)
defer widthFin()

heightArg, heightFin := datautils.WrapNumberPtr[C.float, float32](&height)
heightArg, heightFin := internal.WrapNumberPtr[C.float, float32](&height)
defer heightFin()

C.igGLFWWindow_GetContentScale(b.handle(), widthArg, heightArg)
Expand All @@ -321,7 +321,7 @@ func (b *GLFWBackend) ContentScale() (width, height float32) {
}

func (b *GLFWBackend) SetWindowTitle(title string) {
titleArg, titleFin := datautils.WrapString[C.char](title)
titleArg, titleFin := internal.WrapString[C.char](title)
defer titleFin()

C.igGLFWWindow_SetTitle(b.handle(), (*C.char)(titleArg))
Expand All @@ -335,11 +335,11 @@ func (b *GLFWBackend) SetWindowSizeLimits(minWidth, minHeight, maxWidth, maxHeig
}

func (b *GLFWBackend) SetShouldClose(value bool) {
C.igGLFWWindow_SetShouldClose(b.handle(), C.int(datautils.CastBool(value)))
C.igGLFWWindow_SetShouldClose(b.handle(), C.bool((value)))
}

func (b *GLFWBackend) CreateWindow(title string, width, height int) {
titleArg, titleFin := datautils.WrapString[C.char](title)
titleArg, titleFin := internal.WrapString[C.char](title)
defer titleFin()

b.window = uintptr(unsafe.Pointer(C.igCreateGLFWWindow(
Expand Down
2 changes: 1 addition & 1 deletion backend/glfwbackend/glfw_backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ extern void igGLFWWindow_GetDisplaySize(GLFWwindow *window, int *width, int *hei
extern void igGLFWWindow_GetContentScale(GLFWwindow *window, float *width, float *height);
extern void igGLFWWindow_SetWindowPos(GLFWwindow *window, int x, int y);
extern void igGLFWWindow_GetWindowPos(GLFWwindow *window, int *x, int *y);
extern void igGLFWWindow_SetShouldClose(GLFWwindow *window, int value);
extern void igGLFWWindow_SetShouldClose(GLFWwindow *window, bool value);
extern void igGLFWWindow_SetDropCallbackCB(GLFWwindow *window);
extern void igGLFWWindow_SetSize(GLFWwindow *window, int width, int height);
extern void igGLFWWindow_SetTitle(GLFWwindow *window, const char *title);
Expand Down
18 changes: 9 additions & 9 deletions backend/sdlbackend/sdl_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"unsafe"

"github.com/AllenDang/cimgui-go/backend"
"github.com/AllenDang/cimgui-go/datautils"
"github.com/AllenDang/cimgui-go/imgui"
"github.com/AllenDang/cimgui-go/internal"
)

type voidCallbackFunc func()
Expand Down Expand Up @@ -311,10 +311,10 @@ func (b *SDLBackend) SetWindowPos(x, y int) {
}

func (b *SDLBackend) GetWindowPos() (x, y int32) {
xArg, xFin := datautils.WrapNumberPtr[C.int, int32](&x)
xArg, xFin := internal.WrapNumberPtr[C.int, int32](&x)
defer xFin()

yArg, yFin := datautils.WrapNumberPtr[C.int, int32](&y)
yArg, yFin := internal.WrapNumberPtr[C.int, int32](&y)
defer yFin()

C.igSDLWindow_GetWindowPos(b.handle(), xArg, yArg)
Expand All @@ -327,10 +327,10 @@ func (b *SDLBackend) SetWindowSize(width, height int) {
}

func (b *SDLBackend) DisplaySize() (width int32, height int32) {
widthArg, widthFin := datautils.WrapNumberPtr[C.int, int32](&width)
widthArg, widthFin := internal.WrapNumberPtr[C.int, int32](&width)
defer widthFin()

heightArg, heightFin := datautils.WrapNumberPtr[C.int, int32](&height)
heightArg, heightFin := internal.WrapNumberPtr[C.int, int32](&height)
defer heightFin()

C.igSDLWindow_GetDisplaySize(b.handle(), widthArg, heightArg)
Expand All @@ -339,10 +339,10 @@ func (b *SDLBackend) DisplaySize() (width int32, height int32) {
}

func (b *SDLBackend) ContentScale() (width, height float32) {
widthArg, widthFin := datautils.WrapNumberPtr[C.float, float32](&width)
widthArg, widthFin := internal.WrapNumberPtr[C.float, float32](&width)
defer widthFin()

heightArg, heightFin := datautils.WrapNumberPtr[C.float, float32](&height)
heightArg, heightFin := internal.WrapNumberPtr[C.float, float32](&height)
defer heightFin()

C.igSDLWindow_GetContentScale(b.handle(), widthArg, heightArg)
Expand All @@ -351,7 +351,7 @@ func (b *SDLBackend) ContentScale() (width, height float32) {
}

func (b *SDLBackend) SetWindowTitle(title string) {
titleArg, titleFin := datautils.WrapString[C.char](title)
titleArg, titleFin := internal.WrapString[C.char](title)
defer titleFin()

C.igSDLWindow_SetTitle(b.handle(), (*C.char)(titleArg))
Expand All @@ -370,7 +370,7 @@ func (b *SDLBackend) SetShouldClose(value bool) {
}

func (b *SDLBackend) CreateWindow(title string, width, height int) {
titleArg, titleFin := datautils.WrapString[C.char](title)
titleArg, titleFin := internal.WrapString[C.char](title)
defer titleFin()

b.window = uintptr(unsafe.Pointer(C.igCreateSDLWindow(
Expand Down
41 changes: 15 additions & 26 deletions cmd/codegen/arguments_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ func getArgWrapper(
"const double*": simplePtrW("float64", "C.double"),
"bool": simpleW("bool", "C.bool"),
"const bool": simpleW("bool", "C.bool"),
"bool*": boolPtrW,
"const bool*": boolPtrW,
"bool*": simplePtrW("bool", "C.bool"),
"const bool*": simplePtrW("bool", "C.bool"),
"ImWchar": simpleW(prefixGoPackage("Wchar", "imgui", context), "C.ImWchar"),
"ImWchar*": simpleW("("+prefixGoPackage("*Wchar", "imgui", context)+")", "(*C.ImWchar)"),
"const ImWchar*": simpleW("("+prefixGoPackage("*Wchar", "imgui", context)+")", "(*C.ImWchar)"),
Expand Down Expand Up @@ -197,7 +197,7 @@ func getArgWrapper(

data = ArgumentWrapperData{
VarName: string("*" + a.Name + "VecArg"),
ArgType: GoIdentifier(fmt.Sprintf("datautils.Vector[%s]", w.ArgType)),
ArgType: GoIdentifier(fmt.Sprintf("vectors.Vector[%s]", w.ArgType)),
ArgDef: fmt.Sprintf(`%[5]s := %[2]s.Data
%[1]s
%[2]sVecArg := new(C.%[3]s)
Expand Down Expand Up @@ -298,7 +298,7 @@ for i, %[1]sV := range %[1]sArg {

w := ArgumentWrapperData{
ArgType: argType,
VarName: fmt.Sprintf("datautils.ConvertCTypes[%s](%sArg)", cType, a.Name),
VarName: fmt.Sprintf("internal.ReinterpretCast[%s](%sArg)", cType, a.Name),
Finalizer: fmt.Sprintf("%sFin()", a.Name),
NoFin: a.RemoveFinalizer,
CType: cType,
Expand All @@ -321,8 +321,8 @@ func constCharW(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: "string",
VarName: fmt.Sprintf("%sArg", arg.Name),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := datautils.WrapString[C.char](%[1]s)", arg.Name),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := datautils.WrapString[C.char](%[1]s)", arg.Name),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := internal.WrapString[C.char](%[1]s)", arg.Name),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := internal.WrapString[C.char](%[1]s)", arg.Name),
Finalizer: fmt.Sprintf("%sFin()", arg.Name),
CType: "*C.char",
}
Expand All @@ -332,8 +332,8 @@ func charPtrPtrW(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: "[]string",
VarName: fmt.Sprintf("%sArg", arg.Name),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := datautils.WrapStringList[C.char](%[1]s)", arg.Name),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := datautils.WrapStringList[C.char](%[1]s)", arg.Name),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := internal.WrapStringList[C.char](%[1]s)", arg.Name),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := internal.WrapStringList[C.char](%[1]s)", arg.Name),
Finalizer: fmt.Sprintf("%sFin()", arg.Name),
CType: "**C.char",
}
Expand All @@ -355,17 +355,6 @@ func sizeTPtrW(arg ArgDef) ArgumentWrapperData {
}
}

func boolPtrW(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: "*bool",
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := datautils.WrapBool[C.bool](%[1]s)", arg.Name),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := datautils.WrapBool[C.bool](%[1]s)", arg.Name),
Finalizer: fmt.Sprintf("%[1]sFin()", arg.Name),
VarName: fmt.Sprintf("%sArg", arg.Name),
CType: "*C.bool",
}
}

func int64ArrayW(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: "[]int64",
Expand Down Expand Up @@ -413,8 +402,8 @@ func simplePtrW(goType GoIdentifier, cType GoIdentifier) argumentWrapper {
return func(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: GoIdentifier(fmt.Sprintf("*%s", goType)),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := datautils.WrapNumberPtr[%[2]s, %[3]s](%[1]s)", arg.Name, cType, goType),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := datautils.WrapNumberPtr[%[2]s, %[3]s](%[1]s)", arg.Name, cType, goType),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := internal.WrapNumberPtr[%[2]s, %[3]s](%[1]s)", arg.Name, cType, goType),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := internal.WrapNumberPtr[%[2]s, %[3]s](%[1]s)", arg.Name, cType, goType),
Finalizer: fmt.Sprintf("%[1]sFin()", arg.Name, cType, goType),
VarName: fmt.Sprintf("%sArg", arg.Name),
CType: "*" + cType,
Expand Down Expand Up @@ -451,7 +440,7 @@ func wrappableW(goType, cType GoIdentifier) argumentWrapper {
return func(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: goType,
VarName: fmt.Sprintf("datautils.ConvertCTypes[%s](%s.ToC())", cType, arg.Name),
VarName: fmt.Sprintf("internal.ReinterpretCast[%s](%s.ToC())", cType, arg.Name),
CType: cType,
}
}
Expand All @@ -462,10 +451,10 @@ func wrappablePtrW(goType, cType GoIdentifier) argumentWrapper {
return func(arg ArgDef) ArgumentWrapperData {
return ArgumentWrapperData{
ArgType: goType,
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := datautils.Wrap(%[1]s)", arg.Name, goType, cType),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := datautils.Wrap(%[1]s)", arg.Name, goType, cType),
ArgDef: fmt.Sprintf("%[1]sArg, %[1]sFin := internal.Wrap(%[1]s)", arg.Name, goType, cType),
ArgDefNoFin: fmt.Sprintf("%[1]sArg, _ := internal.Wrap(%[1]s)", arg.Name, goType, cType),
Finalizer: fmt.Sprintf("%[1]sFin()", arg.Name, goType, cType),
VarName: fmt.Sprintf("datautils.ConvertCTypes[*%s](%sArg)", cType, arg.Name),
VarName: fmt.Sprintf("internal.ReinterpretCast[*%s](%sArg)", cType, arg.Name),
CType: "*" + cType,
}
}
Expand All @@ -477,7 +466,7 @@ func wrappablePtrArrayW(size int, cArrayType GoIdentifier, goArrayType GoIdentif
%[1]sFin := make([]func(), len(%[1]s))
for i, %[1]sV := range %[1]s {
var tmp *%[2]s
tmp, %[1]sFin[i] = datautils.Wrap(%[1]sV)
tmp, %[1]sFin[i] = internal.Wrap(%[1]sV)
%[1]sArg[i] = *tmp
}
`, arg.Name, cArrayType, goArrayType)
Expand Down
8 changes: 4 additions & 4 deletions cmd/codegen/gengo_typedefs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func (self %[1]s) C() (C.%[6]s, func()) {
// New%[1]sFromC creates %[1]s from its C pointer.
// SRC ~= *C.%[6]s
func New%[1]sFromC[SRC any](cvalue SRC) *%[1]s {
return &%[1]s{Data: (uintptr)(C.%[6]s_toUintptr(*datautils.ConvertCTypes[*C.%[6]s](cvalue)))}
return &%[1]s{Data: (uintptr)(C.%[6]s_toUintptr(*internal.ReinterpretCast[*C.%[6]s](cvalue)))}
}
`,
k.renameGoIdentifier(),
Expand Down Expand Up @@ -260,7 +260,7 @@ func New%[1]sFromC[SRC any](cvalue SRC) *%[1]s {
knownArgType.VarName,
knownArgType.Finalizer,

fmt.Sprintf(knownPtrReturnType.returnStmt, fmt.Sprintf("datautils.ConvertCTypes[*C.%s](cvalue)", k)),
fmt.Sprintf(knownPtrReturnType.returnStmt, fmt.Sprintf("internal.ReinterpretCast[*C.%s](cvalue)", k)),
)

generatedTypedefs++
Expand Down Expand Up @@ -289,7 +289,7 @@ func (selfStruct *%[1]s) C() (result C.%[6]s, fin func()) {
// New%[1]sFromC creates %[1]s from its C pointer.
// SRC ~= *C.%[6]s
func New%[1]sFromC[SRC any](cvalue SRC) *%[1]s {
v := (%[8]s)(*datautils.ConvertCTypes[*C.%[6]s](cvalue))
v := (%[8]s)(*internal.ReinterpretCast[*C.%[6]s](cvalue))
return &%[1]s{Data: %[7]s}
}
`,
Expand Down Expand Up @@ -379,7 +379,7 @@ func (self *%[1]s) Handle() (result *C.%[2]s, fin func()) {
// New%[1]sFromC creates %[1]s from its C pointer.
// SRC ~= *C.%[2]s
func New%[1]sFromC[SRC any](cvalue SRC) *%[1]s {
return &%[1]s{CData: datautils.ConvertCTypes[*C.%[2]s](cvalue)}
return &%[1]s{CData: internal.ReinterpretCast[*C.%[2]s](cvalue)}
}
`, name.renameGoIdentifier(), name, toPlainValue)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/codegen/return_wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ func getReturnWrapper(
}

return returnWrapper{
returnType: GoIdentifier(fmt.Sprintf("datautils.Vector[%s]", rw.returnType)),
returnStmt: fmt.Sprintf("datautils.NewVectorFromC(%%[1]s.Size, %%[1]s.Capacity, %s)", fmt.Sprintf(rw.returnStmt, "%[1]s.Data")),
returnType: GoIdentifier(fmt.Sprintf("vectors.Vector[%s]", rw.returnType)),
returnStmt: fmt.Sprintf("vectors.NewVectorFromC(%%[1]s.Size, %%[1]s.Capacity, %s)", fmt.Sprintf(rw.returnStmt, "%[1]s.Data")),
}, nil
case HasSuffix(t, "*") && isEnum(TrimSuffix(t, "*"), context.enumNames):
goType := prefixGoPackage("*"+TrimSuffix(t, "*").renameEnum(), srcPackage, context)
Expand Down
Loading
Loading