Simplify call argument checks

Author: Jake Moss

src/flint/types/fmpq_mpoly.pyx

@@ -542,17 +542,10 @@ cdef class fmpq_mpoly(flint_mpoly):
             fmpq vres
             slong nvars = self.ctx.nvars(), nargs = len(args)
 
-        if nargs < nvars:
-            raise ValueError("not enough arguments provided")
-        elif nargs > nvars:
-            raise ValueError("more arguments provided than variables")
-
-        args_fmpq = tuple(any_as_fmpq(v) for v in args)
-        for arg in args_fmpq:
-            if arg is NotImplemented:
-                raise TypeError(f"cannot coerce argument ('{arg}') to fmpq")
+        if nargs != nvars:
+            raise ValueError("number of generators does not match number of arguments")
 
-        V = fmpq_vec(args_fmpq, double_indirect=True)
+        V = fmpq_vec(args, double_indirect=True)
         vres = fmpq.__new__(fmpq)
         if fmpq_mpoly_evaluate_all_fmpq(vres.val, self.val, V.double_indirect, self.ctx.val) == 0:
             raise ValueError("unreasonably large polynomial")  # pragma: no cover

src/flint/types/fmpz_mod_mpoly.pyx

@@ -605,17 +605,10 @@ cdef class fmpz_mod_mpoly(flint_mpoly):
             fmpz vres
             slong nvars = self.ctx.nvars(), nargs = len(args)
 
-        if nargs < nvars:
-            raise ValueError("not enough arguments provided")
-        elif nargs > nvars:
-            raise ValueError("more arguments provided than variables")
-
-        args_fmpz = tuple(any_as_fmpz(v) for v in args)
-        for arg in args_fmpz:
-            if arg is NotImplemented:
-                raise TypeError(f"cannot coerce argument ('{arg}') to fmpz")
+        if nargs != nvars:
+            raise ValueError("number of generators does not match number of arguments")  # TODO: fix for all of them
 
-        V = fmpz_vec(args_fmpz, double_indirect=True)
+        V = fmpz_vec(args, double_indirect=True)
         vres = fmpz.__new__(fmpz)
         fmpz_mod_mpoly_evaluate_all_fmpz(vres.val, self.val, V.double_indirect, self.ctx.val)
         return vres

src/flint/types/fmpz_mpoly.pyx

@@ -520,17 +520,10 @@ cdef class fmpz_mpoly(flint_mpoly):
             fmpz vres
             slong nvars = self.ctx.nvars(), nargs = len(args)
 
-        if nargs < nvars:
-            raise ValueError("not enough arguments provided")
-        elif nargs > nvars:
-            raise ValueError("more arguments provided than variables")
-
-        args_fmpz = tuple(any_as_fmpz(v) for v in args)
-        for arg in args_fmpz:
-            if arg is NotImplemented:
-                raise TypeError(f"cannot coerce argument ('{arg}') to fmpz")
+        if nargs != nvars:
+            raise ValueError("number of generators does not match number of arguments")
 
-        V = fmpz_vec(args_fmpz, double_indirect=True)
+        V = fmpz_vec(args, double_indirect=True)
         vres = fmpz.__new__(fmpz)
         if fmpz_mpoly_evaluate_all_fmpz(vres.val, self.val, V.double_indirect, self.ctx.val) == 0:
             raise ValueError("unreasonably large polynomial")  # pragma: no cover

src/flint/types/nmod_mpoly.pyx

@@ -686,13 +686,10 @@ cdef class nmod_mpoly(flint_mpoly):
         cdef:
             slong nvars = self.ctx.nvars(), nargs = len(args)
 
-        if nargs < nvars:
-            raise ValueError("not enough arguments provided")
-        elif nargs > nvars:
-            raise ValueError("more arguments provided than variables")
+        if nargs != nvars:
+            raise ValueError("number of generators does not match number of arguments")
 
         args = [int(x) for x in args]
-
         cdef:
             # Using sizeof(ulong) here breaks on 64 windows machines because of the `ctypedef unsigned long ulong` in
             # flintlib/flint.pxd. Cython will inline this definition and then allocate the wrong amount of memory.