feat: fixes for adding gr_ scalar types

Author: oscarbenjamin

src/flint/types/gr.pxd

@@ -162,27 +162,72 @@ cdef class gr_ctx(flint_ctx):
             return AssertionError("Bad error code")
 
 
+cdef class gr_scalar_ctx(gr_ctx):
+    pass
+
+
+cdef class gr_poly_ctx(gr_ctx):
+    pass
+
+
+cdef class gr_mpoly_ctx(gr_ctx):
+    pass
+
+
+cdef class gr_matrix_domain_ctx(gr_ctx):
+    pass
+
+
+cdef class gr_matrix_space_ctx(gr_ctx):
+    pass
+
+
+cdef class gr_matrix_ring_ctx(gr_ctx):
+    pass
+
+
 @cython.no_gc
-cdef class _gr_fmpz_ctx(gr_ctx):
+cdef class _gr_fmpz_ctx(gr_scalar_ctx):
 
     @staticmethod
     cdef _gr_fmpz_ctx _new()
 
 
 @cython.no_gc
-cdef class _gr_fmpq_ctx(gr_ctx):
+cdef class _gr_fmpq_ctx(gr_scalar_ctx):
 
     @staticmethod
     cdef _gr_fmpq_ctx _new()
 
 
 @cython.no_gc
-cdef class _gr_fmpzi_ctx(gr_ctx):
+cdef class _gr_fmpzi_ctx(gr_scalar_ctx):
 
     @staticmethod
     cdef _gr_fmpzi_ctx _new()
 
 
+@cython.no_gc
+cdef class _gr_fmpz_poly_ctx(gr_poly_ctx):
+
+    @staticmethod
+    cdef _gr_fmpz_poly_ctx _new()
+
+
+@cython.no_gc
+cdef class _gr_fmpq_poly_ctx(gr_poly_ctx):
+
+    @staticmethod
+    cdef _gr_fmpq_poly_ctx _new()
+
+
+@cython.no_gc
+cdef class _gr_gr_poly_ctx(gr_poly_ctx):
+
+    @staticmethod
+    cdef _gr_gr_poly_ctx _new()
+
+
 # The global contexts for use in cython code:
 cdef _gr_fmpz_ctx gr_fmpz_ctx_c
 cdef _gr_fmpq_ctx gr_fmpq_ctx_c
@@ -362,7 +407,6 @@ cdef class gr(flint_scalar):
             raise self._error(err, "Failed to compute lcm of gr objects")
         return res
 
-    # XXX: Needs gr_vec_t
     cdef inline _factor(self):
         cdef int err, i
         cdef slong length, exp_s

src/flint/types/gr.pyx

@@ -327,14 +327,14 @@ cdef class gr(flint_scalar):
             err = gr_set_si(other_gr.pval, other, self.ctx.ctx_t)
             if err != GR_SUCCESS:
                 raise self.ctx._error(err, "Cannot set gr from int")
-        elif not isinstance(other, gr):
+        elif isinstance(other, gr):
+            other_gr = other
+        else:
             raise NotImplementedError("Cannot compare gr with non-gr objects")
 
         if self.ctx != other_gr.ctx:
             raise NotImplementedError("Cannot compare gr with different contexts")
 
-        other_gr = other
-
         if op == 0:
             raise NotImplementedError("Cannot compare gr with <")
             # res = self._lt(other_gr)
@@ -460,7 +460,7 @@ cdef class gr(flint_scalar):
         if not isinstance(other, gr):
             raise TypeError("gcd when other is not gr.")
         other_gr = other
-        if not self.ctx == other.ctx:
+        if not self.ctx == other_gr.ctx:
             raise TypeError("gcd of gr with different contexts.")
         return self._gcd(other_gr)
 
@@ -469,7 +469,7 @@ cdef class gr(flint_scalar):
         if not isinstance(other, gr):
             raise TypeError("gcd when other is not gr.")
         other_gr = other
-        if not self.ctx == other.ctx:
+        if not self.ctx == other_gr.ctx:
             raise TypeError("gcd of gr with different contexts.")
         return self._gcd(other_gr)