Assorted code improvements

Author: jdemeyer

cypari2/gen.pyx

@@ -72,8 +72,7 @@ from .convert cimport PyObject_AsGEN, gen_to_integer
 from .pari_instance cimport (prec_bits_to_words, prec_words_to_bits,
                              default_bitprec, get_var)
 from .stack cimport (new_gen, new_gen_noclear,
-                     clone_gen, clone_gen_noclear,
-                     clear_stack, reset_avma,
+                     clone_gen, clear_stack, reset_avma,
                      remove_from_pari_stack, move_gens_to_heap)
 from .closure cimport objtoclosure
 
@@ -1465,9 +1464,9 @@ cdef class Gen(Gen_base):
     def __len__(self):
         return glength(self.g)
 
-    def __richcmp__(left, right, int op):
+    def __richcmp__(self, right, int op):
         """
-        Compare ``left`` and ``right`` using ``op``.
+        Compare ``self`` and ``right`` using ``op``.
 
         Examples:
 
@@ -1528,14 +1527,13 @@ cdef class Gen(Gen_base):
         >>> pari('O(2)') == 0
         True
         """
-        cdef Gen t0, t1
+        cdef Gen t1
         try:
-            t0 = objtogen(left)
             t1 = objtogen(right)
         except Exception:
             return NotImplemented
         cdef bint r
-        cdef GEN x = t0.g
+        cdef GEN x = self.g
         cdef GEN y = t1.g
         sig_on()
         if op == Py_EQ:
@@ -1605,7 +1603,8 @@ cdef class Gen(Gen_base):
         return r
 
     def __copy__(self):
-        return clone_gen_noclear(self.g)
+        sig_on()
+        return clone_gen(self.g)
 
     def __oct__(self):
         """
@@ -1821,6 +1820,7 @@ cdef class Gen(Gen_base):
         >>> pari("[1,2,3]~").python_list()
         [1, 2, 3]
         """
+        # TODO: deprecate
         cdef long n
         cdef Gen t
 
@@ -2574,7 +2574,7 @@ cdef class Gen(Gen_base):
         sig_on()
         return new_gen(precision0(x.g, n))
 
-    def round(x, estimate=False):
+    def round(x, bint estimate=False):
         """
         round(x,estimate=False): If x is a real number, returns x rounded
         to the nearest integer (rounding up). If the optional argument
@@ -2695,7 +2695,7 @@ cdef class Gen(Gen_base):
         """
         return gsizebyte(x.g)
 
-    def truncate(x, estimate=False):
+    def truncate(x, bint estimate=False):
         """
         truncate(x,estimate=False): Return the truncation of x. If estimate
         is True, also return the number of error bits.
@@ -3192,13 +3192,10 @@ cdef class Gen(Gen_base):
         <... 'int'>
         """
         sig_on()
-        cdef GEN g = ellan(self.g, n)
-        if python_ints:
-            v = [gtolong(gel(g, i+1)) for i in range(glength(g))]
-            clear_stack()
-            return v
-        else:
-            return new_gen(g)
+        cdef Gen g = new_gen(ellan(self.g, n))
+        if not python_ints:
+            return g
+        return [gtolong(gel(g.g, i+1)) for i in range(glength(g.g))]
 
     def ellaplist(self, long n, python_ints=False):
         r"""
@@ -3932,56 +3929,7 @@ cdef class Gen(Gen_base):
         >>> nf(x='y')
         [y^2 + 1, [0, 1], -4, 1, [Mat([1, 0.E-38 + 1.00000000000000*I]), [1, 1.00000000000000; 1, -1.00000000000000], [1, 1; 1, -1], [2, 0; 0, -2], [2, 0; 0, 2], [1, 0; 0, -1], [1, [0, -1; 1, 0]], [2]], [0.E-38 + 1.00000000000000*I], [1, y], [1, 0; 0, 1], [1, 0, 0, -1; 0, 1, 1, 0]]
         """
-        cdef long t = typ(self.g)
-        cdef Gen t0
-        cdef GEN result
-        cdef long arity
-        cdef long nargs = len(args)
-        cdef long nkwds = len(kwds)
-
-        # Closure must be evaluated using *args
-        if t == t_CLOSURE:
-            if nkwds > 0:
-                raise TypeError("cannot evaluate a PARI closure using keyword arguments")
-            if closure_is_variadic(self.g):
-                arity = closure_arity(self.g) - 1
-                args = list(args[:arity]) + [0]*(arity-nargs) + [args[arity:]]
-            t0 = objtogen(args)
-            sig_on()
-            result = closure_callgenvec(self.g, t0.g)
-            if result == gnil:
-                clear_stack()
-                return None
-            return new_gen(result)
-
-        # Evaluate univariate polynomials, rational functions and
-        # series using *args
-        if nargs > 0:
-            if nkwds > 0:
-                raise TypeError("mixing unnamed and keyword arguments not allowed when evaluating a PARI object")
-            if not (t == t_POL or t == t_RFRAC or t == t_SER):
-                raise TypeError("cannot evaluate PARI %s using unnamed arguments" % self.type())
-            if nargs != 1:
-                raise TypeError("evaluating PARI %s takes exactly 1 argument (%d given)"
-                                % (self.type(), nargs))
-
-            t0 = objtogen(args[0])
-            sig_on()
-            if t == t_POL or t == t_RFRAC:
-                return new_gen(poleval(self.g, t0.g))
-            else:  # t == t_SER
-                return new_gen(gsubst(self.g, varn(self.g), t0.g))
-
-        # Call substvec() using **kwds
-        vstr = iter(kwds.iterkeys())        # Variables as Python strings
-        t0 = objtogen(kwds.values())        # Replacements
-
-        sig_on()
-        cdef GEN v = cgetg(nkwds+1, t_VEC)  # Variables as PARI polynomials
-        cdef long i
-        for i in range(nkwds):
-            set_gel(v, i+1, pol_x(get_var(next(vstr))))
-        return new_gen(gsubstvec(self.g, v, t0.g))
+        return self(*args, **kwds)
 
     def __call__(self, *args, **kwds):
         """
@@ -4026,7 +3974,57 @@ cdef class Gen(Gen_base):
         ...
         TypeError: cannot evaluate PARI t_INT using unnamed arguments
         """
-        return self.eval(*args, **kwds)
+        cdef long t = typ(self.g)
+        cdef Gen t0
+        cdef GEN result
+        cdef long arity
+        cdef long nargs = len(args)
+        cdef long nkwds = len(kwds)
+
+        # Closure must be evaluated using *args
+        if t == t_CLOSURE:
+            if nkwds:
+                raise TypeError("cannot evaluate a PARI closure using keyword arguments")
+            if closure_is_variadic(self.g):
+                arity = closure_arity(self.g) - 1
+                args = list(args[:arity]) + [0]*(arity-nargs) + [args[arity:]]
+            t0 = objtogen(args)
+            sig_on()
+            result = closure_callgenvec(self.g, t0.g)
+            if result is gnil:
+                clear_stack()
+                return None
+            return new_gen(result)
+
+        # Evaluate univariate polynomials, rational functions and
+        # series using *args
+        if nargs:
+            if nkwds:
+                raise TypeError("mixing unnamed and keyword arguments not allowed when evaluating a PARI object")
+            if not (t == t_POL or t == t_RFRAC or t == t_SER):
+                raise TypeError("cannot evaluate PARI %s using unnamed arguments" % self.type())
+            if nargs != 1:
+                raise TypeError("evaluating PARI %s takes exactly 1 argument (%d given)"
+                                % (self.type(), nargs))
+
+            t0 = objtogen(args[0])
+            sig_on()
+            if t == t_POL or t == t_RFRAC:
+                return new_gen(poleval(self.g, t0.g))
+            else:  # t == t_SER
+                return new_gen(gsubst(self.g, varn(self.g), t0.g))
+
+        # Call substvec() using **kwds
+        cdef list V = [to_bytes(k) for k in kwds]  # Variables as Python byte strings
+        t0 = objtogen(kwds.values())               # Replacements
+
+        sig_on()
+        cdef GEN v = cgetg(nkwds+1, t_VEC)  # Variables as PARI polynomials
+        cdef long i
+        for i in range(nkwds):
+            varname = <bytes>V[i]
+            set_gel(v, i+1, pol_x(fetch_user_var(varname)))
+        return new_gen(gsubstvec(self.g, v, t0.g))
 
     def factorpadic(self, p, long r=20):
         """
@@ -4275,7 +4273,7 @@ cdef class Gen(Gen_base):
     def __abs__(self):
         return self.abs()
 
-    def nextprime(self, bint add_one=0):
+    def nextprime(self, bint add_one=False):
         """
         nextprime(x): smallest pseudoprime greater than or equal to `x`.
         If ``add_one`` is non-zero, return the smallest pseudoprime
@@ -4345,7 +4343,8 @@ cdef class Gen(Gen_base):
         if typ(self.g) != t_POL and typ(self.g) != t_SER:
             raise TypeError("set_variable() only works for polynomials or power series")
         # Copy self and then change the variable in place
-        newg = clone_gen_noclear(self.g)
+        sig_on()
+        newg = clone_gen(self.g)
         setvarn(newg.g, n)
         return newg
 

cypari2/pari_instance.pyx

@@ -315,6 +315,7 @@ def prec_bits_to_dec(long prec_in_bits):
     """
     return nbits2ndec(prec_in_bits)
 
+
 def prec_dec_to_bits(long prec_in_dec):
     r"""
     Convert from precision expressed in decimal to precision expressed
@@ -331,6 +332,7 @@ def prec_dec_to_bits(long prec_in_dec):
     cdef double log_10 = 3.32192809488736
     return int(prec_in_dec*log_10 + 1.0)  # Add one to round up
 
+
 cpdef long prec_bits_to_words(unsigned long prec_in_bits):
     r"""
     Convert from precision expressed in bits to pari real precision
@@ -358,6 +360,7 @@ cpdef long prec_bits_to_words(unsigned long prec_in_bits):
     # This equals ceil(prec_in_bits/wordsize) + 2
     return (prec_in_bits - 1)//wordsize + 3
 
+
 cpdef long prec_words_to_bits(long prec_in_words):
     r"""
     Convert from pari real precision expressed in words to precision
@@ -380,6 +383,7 @@ cpdef long prec_words_to_bits(long prec_in_words):
     # see user's guide to the pari library, page 10
     return (prec_in_words - 2) * BITS_IN_LONG
 
+
 cpdef long default_bitprec():
     r"""
     Return the default precision in bits.
@@ -392,6 +396,7 @@ cpdef long default_bitprec():
     """
     return (prec - 2) * BITS_IN_LONG
 
+
 def prec_dec_to_words(long prec_in_dec):
     r"""
     Convert from precision expressed in decimal to precision expressed
@@ -413,6 +418,7 @@ def prec_dec_to_words(long prec_in_dec):
     """
     return prec_bits_to_words(prec_dec_to_bits(prec_in_dec))
 
+
 def prec_words_to_dec(long prec_in_words):
     r"""
     Convert from precision expressed in words to precision expressed in
@@ -844,6 +850,7 @@ cdef class Pari(Pari_auto):
         pari.new_with_bits_prec(self, s, precision) creates s as a PARI
         Gen with (at most) precision *bits* of precision.
         """
+        # TODO: deprecate
         cdef unsigned long old_prec
         old_prec = GP_DATA.fmt.sigd
         precision = prec_bits_to_dec(precision)
@@ -1243,7 +1250,8 @@ cdef class Pari(Pari_auto):
         ...
         IndexError: length of entries (=3) must equal n (=2)
         """
-        cdef Gen v = self._empty_vector(n)
+        # TODO: deprecate
+        v = self._empty_vector(n)
         if entries is not None:
             if len(entries) != n:
                 raise IndexError("length of entries (=%s) must equal n (=%s)"%\

cypari2/stack.pyx

@@ -19,7 +19,7 @@ cimport cython
 
 from cpython.ref cimport PyObject, Py_XINCREF, Py_XDECREF
 
-from cysignals.signals cimport sig_on, sig_off
+from cysignals.signals cimport sig_on, sig_off, sig_block, sig_unblock
 from cysignals.memory cimport check_malloc, sig_free
 
 from .gen cimport Gen, Gen_new
@@ -32,6 +32,7 @@ from warnings import warn
 
 cdef extern from *:
     int sig_on_count "cysigs.sig_on_count"
+    int block_sigint "cysigs.block_sigint"
 
 
 # Singleton object to denote the top of the PARI stack
@@ -59,6 +60,8 @@ cdef void remove_from_pari_stack(Gen self):
         else:
             warn(f"cypari2 leaked {self.sp() - avma} bytes on the PARI stack",
                  RuntimeWarning, stacklevel=2)
+    if sig_on_count and not block_sigint:
+        print(f"ERROR: sig_on_count = {sig_on_count} during remove_from_pari_stack()")
     n = self.next
     stackbottom = <PyObject*>n
     self.next = None
@@ -121,8 +124,10 @@ cdef int move_gens_to_heap(pari_sp lim) except -1:
         current = <Gen>stackbottom
         sig_on()
         current.g = gclone(current.g)
-        sig_off()
+        sig_block()
         remove_from_pari_stack(current)
+        sig_unblock()
+        sig_off()
         # The .address attribute can only be updated now because it is
         # needed in remove_from_pari_stack(). This means that the object
         # is temporarily in an inconsistent state but this does not
@@ -159,7 +164,7 @@ cdef Gen new_gen_noclear(GEN x):
         elif isclone(x):
             gclone_refc(x)
             return Gen_new(x, x)
-        raise RuntimeError("new_gen() argument not on PARI stack, not on PARI heap and not a universal constant")
+        raise SystemError("new_gen() argument not on PARI stack, not on PARI heap and not a universal constant")
 
     z = Gen_stack_new(x)