dep: update UseDepKind handling for pkgcraft changes

Author: radhermit

src/pkgcraft/C.pxd

@@ -97,17 +97,8 @@ cdef extern from "pkgcraft.h":
 
     # Package USE dependency default when missing.
     cdef enum UseDepDefault:
-        USE_DEP_DEFAULT_ENABLED,
         USE_DEP_DEFAULT_DISABLED,
-
-    # Package USE dependency type.
-    cdef enum UseDepKind:
-        USE_DEP_KIND_ENABLED,
-        USE_DEP_KIND_DISABLED,
-        USE_DEP_KIND_EQUAL,
-        USE_DEP_KIND_NOT_EQUAL,
-        USE_DEP_KIND_ENABLED_CONDITIONAL,
-        USE_DEP_KIND_DISABLED_CONDITIONAL,
+        USE_DEP_DEFAULT_ENABLED,
 
     # System config
     cdef struct Config:
@@ -207,6 +198,18 @@ cdef extern from "pkgcraft.h":
     cdef struct Version:
         pass
 
+    # Package USE dependency type.
+    cdef enum UseDepKind_Tag:
+        USE_DEP_KIND_ENABLED,
+        USE_DEP_KIND_EQUAL,
+        USE_DEP_KIND_CONDITIONAL,
+
+    cdef struct UseDepKind:
+        UseDepKind_Tag tag
+        bool enabled
+        bool equal
+        bool conditional
+
     # C-compatible wrapper for pkgcraft::dep::UseDep.
     cdef struct UseDep:
         UseDepKind kind

src/pkgcraft/dep/use_dep.pxd

@@ -4,6 +4,7 @@ from .. cimport C
 cdef class UseDep:
     cdef C.UseDep *ptr
     cdef readonly object kind
+    cdef readonly bint enabled
     cdef readonly str flag
     cdef object default_
     # cached fields

src/pkgcraft/dep/use_dep.pyx

@@ -8,16 +8,13 @@ from ..error import PkgcraftError
 
 class UseDepKind(IntEnum):
     Enabled = C.USE_DEP_KIND_ENABLED
-    Disabled = C.USE_DEP_KIND_DISABLED
     Equal = C.USE_DEP_KIND_EQUAL
-    NotEqual = C.USE_DEP_KIND_NOT_EQUAL
-    EnabledConditional = C.USE_DEP_KIND_ENABLED_CONDITIONAL
-    DisabledConditional = C.USE_DEP_KIND_DISABLED_CONDITIONAL
+    Conditional = C.USE_DEP_KIND_CONDITIONAL
 
 
 class UseDepDefault(IntEnum):
-    Enabled = C.USE_DEP_DEFAULT_ENABLED
     Disabled = C.USE_DEP_DEFAULT_DISABLED
+    Enabled = C.USE_DEP_DEFAULT_ENABLED
 
 
 cdef class UseDep:
@@ -41,7 +38,7 @@ cdef class UseDep:
         >>> u = UseDep('!use?')
         >>> u.flag
         'use'
-        >>> u.kind == UseDepKind.DisabledConditional
+        >>> u.kind == UseDepKind.Conditional
         True
         >>> u.default is None
         True
@@ -77,7 +74,8 @@ cdef class UseDep:
         if inst is None:
             inst = <UseDep>UseDep.__new__(UseDep)
         inst.ptr = <C.UseDep *>ptr
-        inst.kind = UseDepKind(ptr.kind)
+        inst.kind = UseDepKind(ptr.kind.tag)
+        inst.enabled = ptr.kind.enabled
         inst.flag = ptr.flag.decode()
         if ptr.default_ is NULL:
             inst.default_ = None
@@ -132,8 +130,7 @@ cdef class UseDep:
     def __repr__(self):
         addr = <size_t>&self.ptr
         name = self.__class__.__name__
-        kind = self.kind.name
-        return f"<{name} {kind} '{self}' at 0x{addr:0x}>"
+        return f"<{name} '{self}' at 0x{addr:0x}>"
 
     def __dealloc__(self):
         C.pkgcraft_use_dep_free(self.ptr)

tests/dep/test_use_dep.py

@@ -14,16 +14,17 @@ def test_creation(self):
             ("(+)", UseDepDefault.Enabled),
             ("(-)", UseDepDefault.Disabled),
         ):
-            for s, kind in (
-                (f"u{d}", UseDepKind.Enabled),
-                (f"-u{d}", UseDepKind.Disabled),
-                (f"u{d}=", UseDepKind.Equal),
-                (f"!u{d}=", UseDepKind.NotEqual),
-                (f"u{d}?", UseDepKind.EnabledConditional),
-                (f"!u{d}?", UseDepKind.DisabledConditional),
+            for s, kind, enabled in (
+                (f"u{d}", UseDepKind.Enabled, True),
+                (f"-u{d}", UseDepKind.Enabled, False),
+                (f"u{d}=", UseDepKind.Equal, True),
+                (f"!u{d}=", UseDepKind.Equal, False),
+                (f"u{d}?", UseDepKind.Conditional, True),
+                (f"!u{d}?", UseDepKind.Conditional, False),
             ):
                 use = UseDep(s)
                 assert use.kind == kind
+                assert use.enabled == enabled
                 assert use.flag == "u"
                 assert use.default == default
                 # verify the internal field is hidden from native python
@@ -37,7 +38,7 @@ def test_creation(self):
                 UseDep(s)
 
     def test_cmp(self):
-        for s1, s2 in (("a", "b"), ("u", "-u"), ("u(+)", "u(-)"), ("u?", "!u?")):
+        for s1, s2 in (("a", "b"), ("-u", "u"), ("u(-)", "u(+)"), ("!u?", "u?")):
             use1 = UseDep(s1)
             use2 = UseDep(s2)
             obj = object()