tinycwrap 0.0.2__tar.gz → 0.0.3__tar.gz

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinycwrap
-Version: 0.0.2
+Version: 0.0.3
 Summary: Lightweight C-to-Python wrapper generator using CFFI and NumPy
 Author: TinyCWrap Contributors
 Requires-Python: >=3.9

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tinycwrap"
-version = "0.0.2"
+version = "0.0.3"
 description = "Lightweight C-to-Python wrapper generator using CFFI and NumPy"
 readme = "README.md"
 requires-python = ">=3.9"

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tests/test_geom.py

@@ -52,3 +52,12 @@ def test_docstring_contains_contract(cg):
     doc = cg.geom2d_rectangle_to_path.__doc__
     assert "Contract: len(out_segments)=4" in doc
     assert "Auto-wrapped C function `geom2d_rectangle_to_path`." in doc
+
+
+def test_polygon_length(cg):
+    pts = cg.G2DPoints(len_points=3)
+    pts.points[0]["x"] = 0.0; pts.points[0]["y"] = 0.0
+    pts.points[1]["x"] = 1.0; pts.points[1]["y"] = 0.0
+    pts.points[2]["x"] = 1.0; pts.points[2]["y"] = 1.0
+    length = cg.geom2d_polygon_length(pts.points)
+    assert length == 2.0

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tests/test_path.py

@@ -21,3 +21,21 @@ def test_path_get_steps_contract(cp):
     expected_len = cp.geom2d_path_get_len_steps(segments, len_segments=len(segments), ds_min=0.25)
     assert len(steps) == expected_len
     assert np.isclose(steps[-1], cp.geom2d_path_get_length(segments, len_segments=1))
+
+
+def test_path_struct_pointer_array(cp):
+    path = cp.G2DPath(len_segments=3)
+    assert path.len_segments == 3
+    assert isinstance(path.segments, np.ndarray)
+    assert path.segments.shape == (3,)
+    assert path.segments.dtype == cp.G2DSegment.dtype
+
+
+def test_return_class_path(cp):
+    path=cp.G2DPath(len_segments=1)
+    cp.geom2d_path_from_circle(1.0, path)
+    assert path.len_segments == 1
+    assert path.segments.shape == (1,)
+    seg = path.segments[0]
+    assert seg['type'] == 1  # circle segment
+    np.testing.assert_allclose(seg['data'][:3], [0.0, 0.0, 1.0])  # cx,cy,radius

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tinycwrap/__init__.py

@@ -6,6 +6,6 @@ from .cmodule import CModule
 try:
     __version__ = version("tinycwrap")
 except PackageNotFoundError:
-    __version__ = "0.0.2"
+    __version__ = "0.0.3"
 
 __all__ = ["CModule", "__version__"]

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tinycwrap/cmodule.py

@@ -462,8 +462,19 @@ class CModule:
         for sname, sspec in self._struct_specs.items():
             try:
                 dtype_fields = []
+                pointer_meta = []
                 for f in sspec.fields:
-                    base_dtype = numpy_dtype_for_base_type(f.base_type)
+                    try:
+                        base_dtype = numpy_dtype_for_base_type(f.base_type)
+                    except TypeError:
+                        base_dtype = None
+                    if f.is_pointer:
+                        dtype_fields.append((f.name, np.uintp))
+                        pointer_meta.append(f)
+                        if base_dtype is None:
+                            continue
+                    if base_dtype is None:
+                        continue
                     if f.array_len:
                         dtype_fields.append((f.name, (base_dtype, (f.array_len,))))
                     else:
@@ -472,15 +483,35 @@ class CModule:
             except TypeError:
                 continue
 
-            def make_struct_class(spec, dtype):
-                slots = ("_data",)
+            def make_struct_class(spec, dtype, _struct_dtypes=self._struct_dtypes):
+                slots = ("_data", "_children")
 
                 def __init__(self, **kwargs):
                     data = np.zeros((), dtype=dtype)
+                    children = {}
+                    # handle pointer+len convention
+                    for f in spec.fields:
+                        if f.is_pointer and f.name in dtype.names:
+                            len_field = f"len_{f.name}"
+                            target_dtype = _struct_dtypes.get(f.base_type)
+                            provided = kwargs.get(f.name)
+                            if provided is not None and target_dtype is not None:
+                                arr = np.ascontiguousarray(provided, dtype=target_dtype)
+                                children[f.name] = arr
+                                data[f.name] = arr.ctypes.data
+                                if len_field in dtype.names and len_field not in kwargs:
+                                    data[len_field] = len(arr)
+                            elif len_field in kwargs and target_dtype is not None:
+                                llen = int(kwargs[len_field])
+                                arr = np.zeros(llen, dtype=target_dtype)
+                                children[f.name] = arr
+                                data[f.name] = arr.ctypes.data
+                                data[len_field] = llen
                     for k in dtype.names:
                         if k in kwargs:
                             data[k] = kwargs[k]
                     object.__setattr__(self, "_data", data)
+                    object.__setattr__(self, "_children", children)
 
                 def __repr__(self):
                     parts_list = []
@@ -508,7 +539,9 @@ class CModule:
                     field_info = dtype.fields[fname][0]
                     is_scalar = field_info.shape == ()
 
-                    def getter(self, fname=fname, is_scalar=is_scalar):
+                    def getter(self, fname=fname, is_scalar=is_scalar, field_info=field_info):
+                        if fname in getattr(self, "_children", {}):
+                            return self._children[fname]
                         val = self._data[fname]
                         return val.item() if is_scalar else val
 
@@ -519,6 +552,11 @@ class CModule:
                         field_info=field_info,
                         is_scalar=is_scalar,
                     ):
+                        if fname in getattr(self, "_children", {}):
+                            arr = np.ascontiguousarray(value, dtype=self._children[fname].dtype)
+                            self._children[fname] = arr
+                            self._data[fname] = arr.ctypes.data
+                            return
                         if is_scalar:
                             self._data[fname] = value
                         else:

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tinycwrap/parsing.py

@@ -200,10 +200,6 @@ def _parse_structs_with_pycparser(cdef: str) -> dict[str, StructSpec]:
                 for decl in struct.decls:
                     ctype, is_ptr, is_const, arr_len = _ctype_from_decl(decl.type)
                     base = base_type_from_ctype(ctype)
-                    try:
-                        numpy_dtype_for_base_type(base)
-                    except TypeError:
-                        continue
                     fields.append(
                         StructField(
                             name=decl.name,
@@ -311,7 +307,7 @@ def _parse_structs_regex(cdef: str) -> dict[str, StructSpec]:
             if not line:
                 continue
             line = re.sub(r"/\*.*?\*/", "", line).strip()
-            m_field = re.match(r"(.+?)\s+([A-Za-z_]\w*)(\s*\[(\d+)\])?$", line)
+            m_field = re.match(r"(.+?\*?)\s*([A-Za-z_]\w*)(\s*\[(\d+)\])?$", line)
             if not m_field:
                 continue
             raw_ctype = m_field.group(1).strip()
@@ -320,10 +316,6 @@ def _parse_structs_regex(cdef: str) -> dict[str, StructSpec]:
             is_pointer = "*" in raw_ctype
             is_const = "const" in raw_ctype
             base = base_type_from_ctype(raw_ctype)
-            try:
-                numpy_dtype_for_base_type(base)
-            except TypeError:
-                continue
             fields.append(
                 StructField(
                     name=fname,

{tinycwrap-0.0.2 → tinycwrap-0.0.3}/tinycwrap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinycwrap
-Version: 0.0.2
+Version: 0.0.3
 Summary: Lightweight C-to-Python wrapper generator using CFFI and NumPy
 Author: TinyCWrap Contributors
 Requires-Python: >=3.9