NewType constructor added

JupiterRider · Dec 22, 2024 · 635a997 · 635a997
1 parent 2fcfd90
commit 635a997
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/examples/structs/raylib/main_unix.go b/examples/structs/raylib/main_unix.go
@@ -27,9 +27,9 @@ type Image struct {
 var gopher []byte
 
 var (
-	TypeImage   = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypePointer, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, nil}[0]}
-	TypeTexture = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypeUint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, nil}[0]}
-	TypeColor   = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, nil}[0]}
+	TypeImage   = ffi.NewType(&ffi.TypePointer, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32)
+	TypeTexture = ffi.NewType(&ffi.TypeUint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32)
+	TypeColor   = ffi.NewType(&ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8)
 )
 
 var (

diff --git a/examples/structs/raylib/main_windows.go b/examples/structs/raylib/main_windows.go
@@ -28,9 +28,9 @@ type Image struct {
 var gopher []byte
 
 var (
-	TypeImage   = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypePointer, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, nil}[0]}
-	TypeTexture = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypeUint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, nil}[0]}
-	TypeColor   = ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, nil}[0]}
+	TypeImage   = ffi.NewType(&ffi.TypePointer, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32)
+	TypeTexture = ffi.NewType(&ffi.TypeUint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32, &ffi.TypeSint32)
+	TypeColor   = ffi.NewType(&ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8, &ffi.TypeUint8)
 )
 
 var (

diff --git a/ffi.go b/ffi.go
@@ -70,6 +70,18 @@ type Type struct {
 	Elements  **Type // Pointer to the first element of a nil-terminated slice.
 }
 
+// NewType can by used to create a new struct [Type].
+//
+// Example:
+//
+//	ffi.NewType(&ffi.TypeFloat, &ffi.TypeFloat)
+//	// is equivalent to
+//	ffi.Type{Type: ffi.Struct, Elements: &[]*ffi.Type{&ffi.TypeFloat, &ffi.TypeFloat, nil}[0]}
+func NewType(elements ...*Type) Type {
+	elements = append(elements, nil)
+	return Type{Type: Struct, Elements: &elements[0]}
+}
+
 // Cif stands for "Call InterFace". It describes the signature of a function.
 //
 // Use [PrepCif] to initialize it.