depset: simplify depset-related C calls for pkgcraft-c updates

Author: radhermit

src/pkgcraft/depset.pxd

@@ -1,22 +1,8 @@
 from . cimport pkgcraft_c as C
 
 
-cdef class DepSetAtom:
-    cdef const C.DepSetAtom *_deps
+cdef class DepSet:
+    cdef C.DepSet *_deps
 
     @staticmethod
-    cdef DepSetAtom from_ptr(const C.DepSetAtom *)
-
-
-cdef class DepSetString:
-    cdef const C.DepSetString *_deps
-
-    @staticmethod
-    cdef DepSetString from_ptr(const C.DepSetString *)
-
-
-cdef class DepSetUri:
-    cdef const C.DepSetUri *_deps
-
-    @staticmethod
-    cdef DepSetUri from_ptr(const C.DepSetUri *)
+    cdef DepSet from_ptr(C.DepSet *)

src/pkgcraft/depset.pyx

@@ -4,49 +4,20 @@ from .pkg cimport Pkg
 from .error import PkgcraftError
 
 
-cdef class DepSetAtom:
-    """Dependency set of atom objects."""
+cdef class DepSet:
+    """Dependency set of objects."""
 
     @staticmethod
-    cdef DepSetAtom from_ptr(const C.DepSetAtom *deps):
-        obj = <DepSetAtom>DepSetAtom.__new__(DepSetAtom)
+    cdef DepSet from_ptr(C.DepSet *deps):
+        obj = <DepSet>DepSet.__new__(DepSet)
         obj._deps = deps
         return obj
 
     def __str__(self):
-        cdef char *c_str = C.pkgcraft_depset_atom_str(self._deps)
+        cdef char *c_str = C.pkgcraft_depset_str(self._deps)
         s = c_str.decode()
         C.pkgcraft_str_free(c_str)
         return s
 
-
-cdef class DepSetString:
-    """Dependency set of string objects."""
-
-    @staticmethod
-    cdef DepSetString from_ptr(const C.DepSetString *deps):
-        obj = <DepSetString>DepSetString.__new__(DepSetString)
-        obj._deps = deps
-        return obj
-
-    def __str__(self):
-        cdef char *c_str = C.pkgcraft_depset_string_str(self._deps)
-        s = c_str.decode()
-        C.pkgcraft_str_free(c_str)
-        return s
-
-
-cdef class DepSetUri:
-    """Dependency set of URI objects."""
-
-    @staticmethod
-    cdef DepSetUri from_ptr(const C.DepSetUri *deps):
-        obj = <DepSetUri>DepSetUri.__new__(DepSetUri)
-        obj._deps = deps
-        return obj
-
-    def __str__(self):
-        cdef char *c_str = C.pkgcraft_depset_uri_str(self._deps)
-        s = c_str.decode()
-        C.pkgcraft_str_free(c_str)
-        return s
+    def __dealloc__(self):
+        C.pkgcraft_depset_free(self._deps)

src/pkgcraft/pkg/ebuild.pyx

@@ -1,6 +1,6 @@
 from .. cimport pkgcraft_c as C
 from .._misc cimport SENTINEL
-from ..depset cimport DepSetAtom, DepSetString, DepSetUri
+from ..depset cimport DepSet
 from . cimport Pkg
 from ..error import PkgcraftError
 from ..repo cimport EbuildRepo
@@ -76,73 +76,73 @@ cdef class EbuildPkg(Pkg):
     @property
     def depend(self):
         """Get a package's DEPEND."""
-        cdef const C.DepSetAtom *deps
+        cdef C.DepSet *deps
         if self._depend is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_depend(self._ebuild_pkg)
-            self._depend = None if deps is NULL else DepSetAtom.from_ptr(deps)
+            self._depend = None if deps is NULL else DepSet.from_ptr(deps)
         return self._depend
 
     @property
     def bdepend(self):
         """Get a package's BDEPEND."""
-        cdef const C.DepSetAtom *deps
+        cdef C.DepSet *deps
         if self._bdepend is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_bdepend(self._ebuild_pkg)
-            self._bdepend = None if deps is NULL else DepSetAtom.from_ptr(deps)
+            self._bdepend = None if deps is NULL else DepSet.from_ptr(deps)
         return self._bdepend
 
     @property
     def idepend(self):
         """Get a package's IDEPEND."""
-        cdef const C.DepSetAtom *deps
+        cdef C.DepSet *deps
         if self._idepend is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_idepend(self._ebuild_pkg)
-            self._idepend = None if deps is NULL else DepSetAtom.from_ptr(deps)
+            self._idepend = None if deps is NULL else DepSet.from_ptr(deps)
         return self._idepend
 
     @property
     def pdepend(self):
         """Get a package's PDEPEND."""
-        cdef const C.DepSetAtom *deps
+        cdef C.DepSet *deps
         if self._pdepend is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_pdepend(self._ebuild_pkg)
-            self._pdepend = None if deps is NULL else DepSetAtom.from_ptr(deps)
+            self._pdepend = None if deps is NULL else DepSet.from_ptr(deps)
         return self._pdepend
 
     @property
     def rdepend(self):
         """Get a package's RDEPEND."""
-        cdef const C.DepSetAtom *deps
+        cdef C.DepSet *deps
         if self._rdepend is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_rdepend(self._ebuild_pkg)
-            self._rdepend = None if deps is NULL else DepSetAtom.from_ptr(deps)
+            self._rdepend = None if deps is NULL else DepSet.from_ptr(deps)
         return self._rdepend
 
     @property
     def license(self):
         """Get a package's LICENSE."""
-        cdef const C.DepSetString *deps
+        cdef C.DepSet *deps
         if self._license is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_license(self._ebuild_pkg)
-            self._license = None if deps is NULL else DepSetString.from_ptr(deps)
+            self._license = None if deps is NULL else DepSet.from_ptr(deps)
         return self._license
 
     @property
     def required_use(self):
         """Get a package's REQUIRED_USE."""
-        cdef const C.DepSetString *deps
+        cdef C.DepSet *deps
         if self._required_use is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_required_use(self._ebuild_pkg)
-            self._required_use = None if deps is NULL else DepSetString.from_ptr(deps)
+            self._required_use = None if deps is NULL else DepSet.from_ptr(deps)
         return self._required_use
 
     @property
     def src_uri(self):
         """Get a package's SRC_URI."""
-        cdef const C.DepSetUri *deps
+        cdef C.DepSet *deps
         if self._src_uri is SENTINEL:
             deps = C.pkgcraft_ebuild_pkg_src_uri(self._ebuild_pkg)
-            self._src_uri = None if deps is NULL else DepSetUri.from_ptr(deps)
+            self._src_uri = None if deps is NULL else DepSet.from_ptr(deps)
         return self._src_uri
 
     @property

src/pkgcraft/pkgcraft_c.pxd

@@ -25,16 +25,8 @@ cdef extern from "pkgcraft.h":
     cdef struct Config:
         pass
 
-    # Opaque wrapper for DepSetAtom objects.
-    cdef struct DepSetAtom:
-        pass
-
-    # Opaque wrapper for DepSetString objects.
-    cdef struct DepSetString:
-        pass
-
-    # Opaque wrapper for DepSetUri objects.
-    cdef struct DepSetUri:
+    # Opaque wrapper for DepSet objects.
+    cdef struct DepSet:
         pass
 
     # EAPI object.
@@ -261,23 +253,17 @@ cdef extern from "pkgcraft.h":
     # The argument should be a UTF-8 string.
     Atom *pkgcraft_cpv(const char *s);
 
-    # Return the formatted string for a DepSetAtom object.
-    #
-    # # Safety
-    # The argument must be a non-null DepSetAtom pointer.
-    char *pkgcraft_depset_atom_str(const DepSetAtom *dep);
-
-    # Return the formatted string for a DepSetString object.
+    # Free a DepSet.
     #
     # # Safety
-    # The argument must be a non-null DepSetString pointer.
-    char *pkgcraft_depset_string_str(const DepSetString *dep);
+    # The argument must be a DepSet pointer or NULL.
+    void pkgcraft_depset_free(DepSet *d);
 
-    # Return the formatted string for a DepSetUri object.
+    # Return the formatted string for a DepSet object.
     #
     # # Safety
-    # The argument must be a non-null DepSetUri pointer.
-    char *pkgcraft_depset_uri_str(const DepSetUri *dep);
+    # The argument must be a non-null DepSet pointer.
+    char *pkgcraft_depset_str(DepSet *dep);
 
     # Return an EAPI's identifier.
     #
@@ -345,15 +331,15 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetAtom *pkgcraft_ebuild_pkg_bdepend(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_bdepend(EbuildPkg *p);
 
     # Return a package's DEPEND.
     #
     # Returns NULL on nonexistence.
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetAtom *pkgcraft_ebuild_pkg_depend(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_depend(EbuildPkg *p);
 
     # Return a package's description.
     #
@@ -381,7 +367,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetAtom *pkgcraft_ebuild_pkg_idepend(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_idepend(EbuildPkg *p);
 
     # Return a package's directly inherited eclasses.
     #
@@ -413,7 +399,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetString *pkgcraft_ebuild_pkg_license(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_license(EbuildPkg *p);
 
     # Return a package's long description.
     #
@@ -448,23 +434,23 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetAtom *pkgcraft_ebuild_pkg_pdepend(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_pdepend(EbuildPkg *p);
 
     # Return a package's RDEPEND.
     #
     # Returns NULL on nonexistence.
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetAtom *pkgcraft_ebuild_pkg_rdepend(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_rdepend(EbuildPkg *p);
 
     # Return a package's REQUIRED_USE.
     #
     # Returns NULL on nonexistence.
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetString *pkgcraft_ebuild_pkg_required_use(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_required_use(EbuildPkg *p);
 
     # Return a package's slot.
     #
@@ -478,7 +464,7 @@ cdef extern from "pkgcraft.h":
     #
     # # Safety
     # The argument must be a non-null EbuildPkg pointer.
-    const DepSetUri *pkgcraft_ebuild_pkg_src_uri(EbuildPkg *p);
+    DepSet *pkgcraft_ebuild_pkg_src_uri(EbuildPkg *p);
 
     # Return a package's subslot.
     #