Skip to content

Commit 57a17e0

Browse files
AermossAermoss
committed
Use 'SDL_FUNC' class instead.
1 parent 30c599f commit 57a17e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1718
-1722
lines changed

‎sdl3/SDL_assert.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .__init__ import os, inspect, ctypes, typing, re, SDL_FUNC_TYPE, SDL_POINTER, \
1+
from .__init__ import os, inspect, ctypes, typing, abc, re, SDL_FUNC_TYPE, SDL_POINTER, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_GET_BINARY, SDL_BINARY
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
@@ -27,7 +27,7 @@ class SDL_AssertData(ctypes.Structure):
2727
("next", SDL_POINTER[SDL_AssertData])
2828
]
2929

30-
SDL_FUNC("SDL_ReportAssertion", SDL_AssertState, SDL_POINTER[SDL_AssertData], ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int)
30+
SDL_ReportAssertion: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ReportAssertion", SDL_AssertState, [SDL_POINTER[SDL_AssertData], ctypes.c_char_p, ctypes.c_char_p, ctypes.c_int]]
3131

3232
SDL_TriggerBreakpoint = lambda: breakpoint()
3333
SDL_AssertBreakpoint = lambda: SDL_TriggerBreakpoint()
@@ -78,10 +78,10 @@ def SDL_enabled_assert(condition: ctypes.c_bool) -> None:
7878
SDL_enabled_assert(False)
7979

8080
SDL_assert_always = lambda condition: SDL_enabled_assert(condition)
81-
SDL_AssertionHandler: typing.TypeAlias = SDL_FUNC_TYPE["SDL_AssertionHandler", SDL_AssertState, SDL_POINTER[SDL_AssertData], ctypes.c_void_p]
81+
SDL_AssertionHandler: typing.TypeAlias = SDL_FUNC_TYPE["SDL_AssertionHandler", SDL_AssertState, [SDL_POINTER[SDL_AssertData], ctypes.c_void_p]]
8282

83-
SDL_FUNC("SDL_SetAssertionHandler", None, SDL_AssertionHandler, ctypes.c_void_p)
84-
SDL_FUNC("SDL_GetDefaultAssertionHandler", SDL_AssertionHandler)
85-
SDL_FUNC("SDL_GetAssertionHandler", SDL_AssertionHandler, SDL_POINTER[ctypes.c_void_p])
86-
SDL_FUNC("SDL_GetAssertionReport", SDL_POINTER[SDL_AssertData])
87-
SDL_FUNC("SDL_ResetAssertionReport", None)
83+
SDL_SetAssertionHandler: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SetAssertionHandler", None, [SDL_AssertionHandler, ctypes.c_void_p]]
84+
SDL_GetDefaultAssertionHandler: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetDefaultAssertionHandler", SDL_AssertionHandler, []]
85+
SDL_GetAssertionHandler: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAssertionHandler", SDL_AssertionHandler, [SDL_POINTER[ctypes.c_void_p]]]
86+
SDL_GetAssertionReport: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAssertionReport", SDL_POINTER[SDL_AssertData], []]
87+
SDL_ResetAssertionReport: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ResetAssertionReport", None, []]

‎sdl3/SDL_asyncio.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .__init__ import ctypes, typing, SDL_POINTER, \
1+
from .__init__ import ctypes, typing, abc, SDL_POINTER, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_BINARY
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
@@ -33,17 +33,17 @@ class SDL_AsyncIOOutcome(ctypes.Structure):
3333
class SDL_AsyncIOQueue(ctypes.c_void_p):
3434
...
3535

36-
SDL_FUNC("SDL_AsyncIOFromFile", SDL_POINTER[SDL_AsyncIO], ctypes.c_char_p, ctypes.c_char_p)
37-
SDL_FUNC("SDL_GetAsyncIOSize", ctypes.c_int64, SDL_POINTER[SDL_AsyncIO])
36+
SDL_AsyncIOFromFile: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_AsyncIOFromFile", SDL_POINTER[SDL_AsyncIO], [ctypes.c_char_p, ctypes.c_char_p]]
37+
SDL_GetAsyncIOSize: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAsyncIOSize", ctypes.c_int64, [SDL_POINTER[SDL_AsyncIO]]]
3838

39-
SDL_FUNC("SDL_ReadAsyncIO", ctypes.c_bool, SDL_POINTER[SDL_AsyncIO], ctypes.c_void_p, ctypes.c_uint64, ctypes.c_uint64, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p)
40-
SDL_FUNC("SDL_WriteAsyncIO", ctypes.c_bool, SDL_POINTER[SDL_AsyncIO], ctypes.c_void_p, ctypes.c_uint64, ctypes.c_uint64, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p)
41-
SDL_FUNC("SDL_CloseAsyncIO", ctypes.c_bool, SDL_POINTER[SDL_AsyncIO], ctypes.c_bool, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p)
39+
SDL_ReadAsyncIO: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_ReadAsyncIO", ctypes.c_bool, [SDL_POINTER[SDL_AsyncIO], ctypes.c_void_p, ctypes.c_uint64, ctypes.c_uint64, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p]]
40+
SDL_WriteAsyncIO: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_WriteAsyncIO", ctypes.c_bool, [SDL_POINTER[SDL_AsyncIO], ctypes.c_void_p, ctypes.c_uint64, ctypes.c_uint64, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p]]
41+
SDL_CloseAsyncIO: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CloseAsyncIO", ctypes.c_bool, [SDL_POINTER[SDL_AsyncIO], ctypes.c_bool, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p]]
4242

43-
SDL_FUNC("SDL_CreateAsyncIOQueue", SDL_POINTER[SDL_AsyncIOQueue])
44-
SDL_FUNC("SDL_DestroyAsyncIOQueue", None, SDL_POINTER[SDL_AsyncIOQueue])
45-
SDL_FUNC("SDL_GetAsyncIOResult", ctypes.c_bool, SDL_POINTER[SDL_AsyncIOQueue], SDL_POINTER[SDL_AsyncIOOutcome])
46-
SDL_FUNC("SDL_WaitAsyncIOResult", ctypes.c_bool, SDL_POINTER[SDL_AsyncIOQueue], SDL_POINTER[SDL_AsyncIOOutcome], ctypes.c_int32)
47-
SDL_FUNC("SDL_SignalAsyncIOQueue", None, SDL_POINTER[SDL_AsyncIOQueue])
43+
SDL_CreateAsyncIOQueue: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CreateAsyncIOQueue", SDL_POINTER[SDL_AsyncIOQueue], []]
44+
SDL_DestroyAsyncIOQueue: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_DestroyAsyncIOQueue", None, [SDL_POINTER[SDL_AsyncIOQueue]]]
45+
SDL_GetAsyncIOResult: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAsyncIOResult", ctypes.c_bool, [SDL_POINTER[SDL_AsyncIOQueue], SDL_POINTER[SDL_AsyncIOOutcome]]]
46+
SDL_WaitAsyncIOResult: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_WaitAsyncIOResult", ctypes.c_bool, [SDL_POINTER[SDL_AsyncIOQueue], SDL_POINTER[SDL_AsyncIOOutcome], ctypes.c_int32]]
47+
SDL_SignalAsyncIOQueue: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SignalAsyncIOQueue", None, [SDL_POINTER[SDL_AsyncIOQueue]]]
4848

49-
SDL_FUNC("SDL_LoadFileAsync", ctypes.c_bool, ctypes.c_char_p, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p)
49+
SDL_LoadFileAsync: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_LoadFileAsync", ctypes.c_bool, [ctypes.c_char_p, SDL_POINTER[SDL_AsyncIOQueue], ctypes.c_void_p]]

‎sdl3/SDL_atomic.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
from .__init__ import ctypes, typing, SDL_POINTER, \
1+
from .__init__ import ctypes, typing, abc, SDL_POINTER, \
22
SDL_FUNC, SDL_TYPE, SDL_SET_CURRENT_BINARY, SDL_GET_BINARY, SDL_BINARY
33

44
SDL_SET_CURRENT_BINARY(SDL_BINARY)
55

66
SDL_SpinLock: typing.TypeAlias = SDL_TYPE["SDL_SpinLock", ctypes.c_int]
77

8-
SDL_FUNC("SDL_TryLockSpinlock", ctypes.c_bool, SDL_POINTER[SDL_SpinLock])
9-
SDL_FUNC("SDL_LockSpinlock", None, SDL_POINTER[SDL_SpinLock])
10-
SDL_FUNC("SDL_UnlockSpinlock", None, SDL_POINTER[SDL_SpinLock])
8+
SDL_TryLockSpinlock: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_TryLockSpinlock", ctypes.c_bool, [SDL_POINTER[SDL_SpinLock]]]
9+
SDL_LockSpinlock: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_LockSpinlock", None, [SDL_POINTER[SDL_SpinLock]]]
10+
SDL_UnlockSpinlock: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_UnlockSpinlock", None, [SDL_POINTER[SDL_SpinLock]]]
1111

12-
SDL_FUNC("SDL_MemoryBarrierReleaseFunction", None)
13-
SDL_FUNC("SDL_MemoryBarrierAcquireFunction", None)
12+
SDL_MemoryBarrierReleaseFunction: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_MemoryBarrierReleaseFunction", None, []]
13+
SDL_MemoryBarrierAcquireFunction: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_MemoryBarrierAcquireFunction", None, []]
1414

1515
class SDL_AtomicInt(ctypes.Structure):
1616
_fields_ = [
1717
("value", ctypes.c_int)
1818
]
1919

20-
SDL_FUNC("SDL_CompareAndSwapAtomicInt", ctypes.c_bool, SDL_POINTER[SDL_AtomicInt], ctypes.c_int, ctypes.c_int)
21-
SDL_FUNC("SDL_SetAtomicInt", ctypes.c_int, SDL_POINTER[SDL_AtomicInt], ctypes.c_int)
22-
SDL_FUNC("SDL_GetAtomicInt", ctypes.c_int, SDL_POINTER[SDL_AtomicInt])
23-
SDL_FUNC("SDL_AddAtomicInt", ctypes.c_int, SDL_POINTER[SDL_AtomicInt], ctypes.c_int)
20+
SDL_CompareAndSwapAtomicInt: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CompareAndSwapAtomicInt", ctypes.c_bool, [SDL_POINTER[SDL_AtomicInt], ctypes.c_int, ctypes.c_int]]
21+
SDL_SetAtomicInt: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SetAtomicInt", ctypes.c_int, [SDL_POINTER[SDL_AtomicInt], ctypes.c_int]]
22+
SDL_GetAtomicInt: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAtomicInt", ctypes.c_int, [SDL_POINTER[SDL_AtomicInt]]]
23+
SDL_AddAtomicInt: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_AddAtomicInt", ctypes.c_int, [SDL_POINTER[SDL_AtomicInt], ctypes.c_int]]
2424

2525
class LP_SDL_AtomicInt(ctypes._Pointer):
2626
...
@@ -36,10 +36,10 @@ class SDL_AtomicU32(ctypes.Structure):
3636
("value", ctypes.c_uint32)
3737
]
3838

39-
SDL_FUNC("SDL_CompareAndSwapAtomicU32", ctypes.c_bool, SDL_POINTER[SDL_AtomicU32], ctypes.c_uint32, ctypes.c_uint32)
40-
SDL_FUNC("SDL_SetAtomicU32", ctypes.c_uint32, SDL_POINTER[SDL_AtomicU32], ctypes.c_uint32)
41-
SDL_FUNC("SDL_GetAtomicU32", ctypes.c_uint32, SDL_POINTER[SDL_AtomicU32])
39+
SDL_CompareAndSwapAtomicU32: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CompareAndSwapAtomicU32", ctypes.c_bool, [SDL_POINTER[SDL_AtomicU32], ctypes.c_uint32, ctypes.c_uint32]]
40+
SDL_SetAtomicU32: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SetAtomicU32", ctypes.c_uint32, [SDL_POINTER[SDL_AtomicU32], ctypes.c_uint32]]
41+
SDL_GetAtomicU32: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAtomicU32", ctypes.c_uint32, [SDL_POINTER[SDL_AtomicU32]]]
4242

43-
SDL_FUNC("SDL_CompareAndSwapAtomicPointer", ctypes.c_bool, SDL_POINTER[ctypes.c_void_p], ctypes.c_void_p, ctypes.c_void_p)
44-
SDL_FUNC("SDL_SetAtomicPointer", ctypes.c_void_p, SDL_POINTER[ctypes.c_void_p], ctypes.c_void_p)
45-
SDL_FUNC("SDL_GetAtomicPointer", ctypes.c_void_p, SDL_POINTER[ctypes.c_void_p])
43+
SDL_CompareAndSwapAtomicPointer: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_CompareAndSwapAtomicPointer", ctypes.c_bool, [SDL_POINTER[ctypes.c_void_p], ctypes.c_void_p, ctypes.c_void_p]]
44+
SDL_SetAtomicPointer: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_SetAtomicPointer", ctypes.c_void_p, [SDL_POINTER[ctypes.c_void_p], ctypes.c_void_p]]
45+
SDL_GetAtomicPointer: abc.Callable[..., typing.Any] = SDL_FUNC["SDL_GetAtomicPointer", ctypes.c_void_p, [SDL_POINTER[ctypes.c_void_p]]]

0 commit comments

Comments
 (0)