Merge pull request #56 from ionite34/dev

Author: ionite34

docs/source/conf.py

@@ -15,7 +15,7 @@
 project = "einspect"
 copyright = "2023, Ionite"
 author = "Ionite"
-release = "v0.5.10"
+release = "v0.5.11"
 
 
 # -- General configuration ---------------------------------------------------

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "einspect"
-version = "0.5.10"
+version = "0.5.11"
 packages = [{ include = "einspect", from = "src" }]
 description = "Extended Inspect - view and modify memory structs of runtime objects."
 authors = ["ionite34 <dev@ionite.io>"]

pyproject.toml

@@ -12,6 +12,6 @@
 
 __all__ = ("view", "unsafe", "impl", "orig", "ptr", "NULL")
 
-__version__ = "0.5.10"
+__version__ = "0.5.11"
 
 unsafe = global_unsafe

src/einspect/__init__.py

@@ -2,13 +2,11 @@
 
 from types import FunctionType
 
-from einspect.structs.deco import struct
 from einspect.structs.include.object_h import vectorcallfunc
 from einspect.structs.py_object import PyObject
 from einspect.types import ptr
 
 
-@struct
 class PyFunctionObject(PyObject[FunctionType, None, None]):
     globals: ptr[PyObject]
     builtins: ptr[PyObject]

src/einspect/_compat/py_function_3_10.py

@@ -2,13 +2,11 @@
 
 from types import FunctionType
 
-from einspect.structs.deco import struct
 from einspect.structs.include.object_h import vectorcallfunc
 from einspect.structs.py_object import PyObject
 from einspect.types import ptr
 
 
-@struct
 class PyFunctionObject(PyObject[FunctionType, None, None]):
     code: ptr[PyObject]  # A code object, the __code__ attribute
     globals: ptr[PyObject]

src/einspect/_compat/py_function_3_9.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from ctypes import (
-    Union,
     addressof,
     c_char,
     c_char_p,
@@ -22,7 +21,7 @@
 
 from einspect.api import Py_hash_t
 from einspect.protocols import bind_api
-from einspect.structs.deco import struct
+from einspect.structs.deco import Union
 from einspect.structs.py_object import Fields, PyObject
 from einspect.structs.traits import IsGC
 from einspect.types import Array, char_p, ptr, void_p
@@ -103,15 +102,13 @@ def type_info(self) -> Type[c_wchar | c_uint8 | c_uint16 | c_uint32]:
         return types_map[int(self)]
 
 
-@struct
 class LegacyUnion(Union):
     any: void_p
     latin1: ptr[c_uint8]  # Py_UCS1
     ucs2: ptr[c_uint16]  # Py_UCS2
     ucs4: ptr[c_uint32]  # Py_UCS4
 
 
-@struct
 class PyASCIIObject(PyObject[str, None, None], IsGC):
     """
     Defines a PyUnicodeObject Structure
@@ -205,7 +202,6 @@ def GetLength(self) -> int:
         """Return the length of the string in code points."""
 
 
-@struct
 class PyCompactUnicodeObject(PyASCIIObject):
     """
     Defines a PyCompactUnicodeObject Structure
@@ -226,7 +222,6 @@ def _format_fields_(self) -> Fields:
         }
 
 
-@struct
 class PyUnicodeObject(PyCompactUnicodeObject):
     """Defines a PyUnicodeObject Structure."""
 

src/einspect/_compat/py_unicode_3_12.py

@@ -6,21 +6,25 @@
 
 from einspect import types
 from einspect.structs.py_object import PyObject
+from einspect.types import Pointer, PyCFuncPtrType
 
 
 class _Null_LP_PyObject(POINTER(PyObject)):
     _type_ = PyObject
 
     def __repr__(self) -> str:
         """Returns the string representation of the pointer."""
-        return f"<NULL ptr[PyObject] at {addressof(self):#04x}>"
+        return f"<Null LP_PyObject at {addressof(self):#04x}>"
 
     def __eq__(self, other) -> bool:
         """Returns equal to other null pointers."""
-        # noinspection PyUnresolvedReferences
-        if not isinstance(other, ctypes._Pointer):
-            return NotImplemented
-        return not other
+        if isinstance(other, Pointer):
+            return not other
+
+        if isinstance(type(other), PyCFuncPtrType):
+            return not ctypes.cast(other, c_void_p)
+
+        return NotImplemented
 
 
 def run() -> None:

src/einspect/_patch.py

@@ -10,6 +10,8 @@
 
 from typing_extensions import Self
 
+from einspect.types import _SelfPtr
+
 log = logging.getLogger(__name__)
 
 Py_ssize_t = ctypes.c_ssize_t
@@ -27,6 +29,7 @@ def __call__(self, *args: Any, **kwargs: Any) -> Any:
 
 
 aliases = {
+    bool: ctypes.c_bool,
     # ctypes will cast c_ssize_t to (int)
     int: Py_ssize_t,
     # ctypes will cast py_object to (object)
@@ -101,6 +104,12 @@ def convert_type_hints(source: type, owner_cls: type) -> type | None:
     if isinstance(source, typing._GenericAlias):
         source = get_origin(source)
 
+    # For special SelfPtr object
+    if source is _SelfPtr:
+        res = POINTER(owner_cls)  # type: ignore
+        res.__module__ = owner_cls.__module__
+        return res
+
     if source in aliases:
         return aliases[source]