typ: use protocol type bounds

Author: oscarbenjamin

src/flint/typing.py

@@ -52,10 +52,6 @@
 ]
 
 
-_Telem = TypeVar("_Telem", bound=flint_scalar)
-_Telem_contra = TypeVar("_Telem_contra", bound=flint_scalar, contravariant=True)
-_Sctx = TypeVar("_Sctx", bound=flint_mpoly_context)
-
 _str = str
 
 
@@ -86,6 +82,7 @@ def __rpow__(self, other: int, /) -> Self: ...
 
 
 _Tscalar = TypeVar("_Tscalar", bound=scalar_p)
+_Tscalar_contra = TypeVar("_Tscalar_contra", bound=scalar_p, contravariant=True)
 
 
 class poly_p(elem_p, Protocol[_Tscalar]):
@@ -143,72 +140,72 @@ def factor_squarefree(self) -> tuple[_Tscalar, list[tuple[Self, int]]]: ...
     def deflation(self) -> tuple[Self, int]: ...
 
 
-class _series_p(elem_p, Protocol[_Telem]):
+class _series_p(elem_p, Protocol[_Tscalar]):
     """FLINT univariate power series."""
 
-    def __iter__(self) -> Iterator[_Telem]: ...
-    def coeffs(self) -> list[_Telem]: ...
+    def __iter__(self) -> Iterator[_Tscalar]: ...
+    def coeffs(self) -> list[_Tscalar]: ...
 
 
-class mpoly_p(elem_p, Protocol[_Telem]):
+class mpoly_p(elem_p, Protocol[_Tscalar]):
    def __init__(
        self,
        val: Self
-       | _Telem
+       | _Tscalar
        | int
-       | Mapping[tuple[int, ...], _Telem | int]
+       | Mapping[tuple[int, ...], _Tscalar | int]
        | str = 0,
        ctx: Any | None = None,
    ) -> None: ...
    def str(self) -> _str: ...
    def repr(self) -> _str: ...
-   def context(self) -> mpoly_context_p[Self, _Telem]: ...
+   def context(self) -> mpoly_context_p[Self, _Tscalar]: ...
    def degrees(self) -> tuple[int, ...]: ...
    def total_degree(self) -> int: ...
-   def leading_coefficient(self) -> _Telem: ...
-   def to_dict(self) -> dict[tuple[int, ...], _Telem]: ...
+   def leading_coefficient(self) -> _Tscalar: ...
+   def to_dict(self) -> dict[tuple[int, ...], _Tscalar]: ...
    def is_one(self) -> bool: ...
    def is_zero(self) -> bool: ...
    def is_constant(self) -> bool: ...
    def __len__(self) -> int: ...
-   def __getitem__(self, index: tuple[int, ...]) -> _Telem: ...
+   def __getitem__(self, index: tuple[int, ...]) -> _Tscalar: ...
    def __setitem__(
-       self, index: tuple[int, ...], coeff: _Telem | int
+       self, index: tuple[int, ...], coeff: _Tscalar | int
    ) -> None: ...
    def __iter__(self) -> Iterable[tuple[int, ...]]: ...
    def __contains__(self, index: tuple[int, ...]) -> bool: ...
-   def coefficient(self, i: int) -> _Telem: ...
+   def coefficient(self, i: int) -> _Tscalar: ...
    def monomial(self, i: int) -> tuple[int, ...]: ...
-   def terms(self) -> Iterable[tuple[tuple[int, ...], _Telem]]: ...
+   def terms(self) -> Iterable[tuple[tuple[int, ...], _Tscalar]]: ...
    def monoms(self) -> list[tuple[int, ...]]: ...
-   def coeffs(self) -> list[_Telem]: ...
+   def coeffs(self) -> list[_Tscalar]: ...
    def __pos__(self) -> Self: ...
    def __neg__(self) -> Self: ...
-   def __add__(self, other: Self | _Telem | int) -> Self: ...
-   def __radd__(self, other: _Telem | int) -> Self: ...
-   def __sub__(self, other: Self | _Telem | int) -> Self: ...
-   def __rsub__(self, other: _Telem | int) -> Self: ...
-   def __mul__(self, other: Self | _Telem | int) -> Self: ...
-   def __rmul__(self, other: _Telem | int) -> Self: ...
-   def __truediv__(self, other: Self | _Telem | int) -> Self: ...
-   def __rtruediv__(self, other: _Telem | int) -> Self: ...
-   def __floordiv__(self, other: Self | _Telem | int) -> Self: ...
-   def __rfloordiv__(self, other: _Telem | int) -> Self: ...
-   def __mod__(self, other: Self | _Telem | int) -> Self: ...
-   def __rmod__(self, other: _Telem | int) -> Self: ...
+   def __add__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __radd__(self, other: _Tscalar | int) -> Self: ...
+   def __sub__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __rsub__(self, other: _Tscalar | int) -> Self: ...
+   def __mul__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __rmul__(self, other: _Tscalar | int) -> Self: ...
+   def __truediv__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __rtruediv__(self, other: _Tscalar | int) -> Self: ...
+   def __floordiv__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __rfloordiv__(self, other: _Tscalar | int) -> Self: ...
+   def __mod__(self, other: Self | _Tscalar | int) -> Self: ...
+   def __rmod__(self, other: _Tscalar | int) -> Self: ...
    def __divmod__(
-       self, other: Self | _Telem | int
+       self, other: Self | _Tscalar | int
    ) -> tuple[Self, Self]: ...
-   def __rdivmod__(self, other: _Telem | int) -> tuple[Self, Self]: ...
-   def __pow__(self, other: _Telem | int) -> Self: ...
-   def __rpow__(self, other: _Telem | int) -> Self: ...
-   def iadd(self, other: _Telem | int) -> None: ...
-   def isub(self, other: _Telem | int) -> None: ...
-   def imul(self, other: _Telem | int) -> None: ...
+   def __rdivmod__(self, other: _Tscalar | int) -> tuple[Self, Self]: ...
+   def __pow__(self, other: _Tscalar | int) -> Self: ...
+   def __rpow__(self, other: _Tscalar | int) -> Self: ...
+   def iadd(self, other: _Tscalar | int) -> None: ...
+   def isub(self, other: _Tscalar | int) -> None: ...
+   def imul(self, other: _Tscalar | int) -> None: ...
    def gcd(self, other: Self) -> Self: ...
    def term_content(self) -> Self: ...
-   def factor(self) -> tuple[_Telem, Sequence[tuple[Self, int]]]: ...
-   def factor_squarefree(self) -> tuple[_Telem, Sequence[tuple[Self, int]]]: ...
+   def factor(self) -> tuple[_Tscalar, Sequence[tuple[Self, int]]]: ...
+   def factor_squarefree(self) -> tuple[_Tscalar, Sequence[tuple[Self, int]]]: ...
    def sqrt(self) -> Self: ...
    def resultant(self, other: Self, var: _str | int) -> Self: ...
    def discriminant(self, var: _str | int) -> Self: ...
@@ -217,9 +214,9 @@ def deflation(self) -> tuple[Self, list[int]]: ...
    def deflation_monom(self) -> tuple[Self, list[int], Self]: ...
    def inflate(self, N: list[int]) -> Self: ...
    def deflate(self, N: list[int]) -> Self: ...
-   def subs(self, mapping: Mapping[_str | int, _Telem | int]) -> Self: ...
+   def subs(self, mapping: Mapping[_str | int, _Tscalar | int]) -> Self: ...
    def compose(self, *args: Self, ctx: Any | None = None) -> Self: ...
-   def __call__(self, *args: _Telem) -> _Telem: ...
+   def __call__(self, *args: _Tscalar) -> _Tscalar: ...
    def derivative(self, var: _str | int) -> Self: ...
    def unused_gens(self) -> tuple[_str, ...]: ...
    def project_to_context(
@@ -230,18 +227,18 @@ def project_to_context(
 _Tmpoly_p = TypeVar("_Tmpoly_p", bound=mpoly_p, covariant=True)
 
 
-class mpoly_context_p(elem_p, Protocol[_Tmpoly_p, _Telem_contra]):
+class mpoly_context_p(elem_p, Protocol[_Tmpoly_p, _Tscalar_contra]):
     def nvars(self) -> int: ...
     def ordering(self) -> Ordering: ...
     def gen(self, i: int, /) -> _Tmpoly_p: ...
-    def from_dict(self, d: Mapping[tuple[int, ...], _Telem_contra | int], /) -> _Tmpoly_p: ...
-    def constant(self, z: _Telem_contra | int, /) -> _Tmpoly_p: ...
+    def from_dict(self, d: Mapping[tuple[int, ...], _Tscalar_contra | int], /) -> _Tmpoly_p: ...
+    def constant(self, z: _Tscalar_contra | int, /) -> _Tmpoly_p: ...
     def name(self, i: int, /) -> str: ...
     def names(self) -> tuple[str]: ...
     def gens(self) -> tuple[_Tmpoly_p, ...]: ...
     def variable_to_index(self, var: str, /) -> int: ...
     def term(
-        self, coeff: _Telem_contra | None = None, exp_vec: Iterable[int] | None = None
+        self, coeff: _Tscalar_contra | None = None, exp_vec: Iterable[int] | None = None
     ) -> _Tmpoly_p: ...
     def drop_gens(self, gens: Iterable[str | int], /) -> Self: ...
     def append_gens(self, gens: Iterable[str | int], /) -> Self: ...
@@ -310,7 +307,7 @@ def _epoly(x: epoly_p[_Tscalar0], y: epoly_p[_Tscalar0]) -> epoly_p[_Tscalar0]:
 
     _Tmpoly0 = TypeVar("_Tmpoly0", bound=mpoly_p)
 
-    def _mpoly(x: mpoly_p[_Telem], y: mpoly_p[_Telem], ctx: mpoly_context_p[_Tmpoly0, _Telem]) -> mpoly_p[_Telem]:
+    def _mpoly(x: mpoly_p[_Tscalar], y: mpoly_p[_Tscalar], ctx: mpoly_context_p[_Tmpoly0, _Tscalar]) -> mpoly_p[_Tscalar]:
         z = x.gcd(y).factor()[1][0][0] + ctx.gens()[0]
         t = z.compose(z, ctx=ctx) + z.context().gens()[0]
         return t