bindings: auto generate arf and arb .pxd files

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -11,6 +11,8 @@ modules="\
     fmpz_poly_factor\
     fmpz_mat\
     fmpz_lll\
+    arf\
+    arb\
     "
 
 for module in $modules; do

src/flint/flint_base/flint_context.pxd

@@ -1,4 +1,4 @@
-from flint.flintlib.arf cimport (
+from flint.flintlib.arf_types cimport (
     arf_rnd_t,
 )
 

src/flint/flint_base/flint_context.pyx

@@ -1,4 +1,4 @@
-from flint.flintlib.arf cimport ARF_RND_DOWN
+from flint.flintlib.arf_types cimport arf_rnd_t
 from flint.flintlib.flint cimport (
     flint_cleanup,
     flint_get_num_threads,
@@ -12,7 +12,7 @@ cdef class FlintContext:
 
     def default(self):
         self.pretty = True
-        self.rnd = ARF_RND_DOWN
+        self.rnd = arf_rnd_t.ARF_RND_DOWN
         self.prec = 53
         self.unicode = False
         self.threads = 1

src/flint/flintlib/acb.pxd

@@ -1,9 +1,8 @@
 from flint.flintlib.flint cimport ulong, slong, flint_rand_t
-from flint.flintlib.arb cimport arb_struct, arb_t, arb_ptr
 from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
-from flint.flintlib.arf cimport arf_t, arf_srcptr
-from flint.flintlib.mag cimport mag_t, mag_srcptr
+from flint.flintlib.arf_types cimport arf_t, arf_srcptr
+from flint.flintlib.arb_types cimport mag_t, mag_srcptr, arb_struct, arb_t, arb_ptr
 
 cdef extern from "flint/acb.h":
     ctypedef struct acb_struct:

src/flint/flintlib/acb_dirichlet.pxd

@@ -3,8 +3,7 @@ from flint.flintlib.dirichlet cimport dirichlet_group_t, dirichlet_char_t
 from flint.flintlib.flint cimport ulong, slong
 from flint.flintlib.acb_poly cimport acb_poly_t
 from flint.flintlib.fmpz cimport fmpz_t
-from flint.flintlib.arb cimport arb_t, arb_ptr
-from flint.flintlib.mag cimport mag_t, mag_struct
+from flint.flintlib.arb_types cimport mag_t, mag_struct, arb_t, arb_ptr
 from flint.flintlib.acb cimport acb_struct, acb_srcptr
 from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.arf cimport arf_t

src/flint/flintlib/arb.pxd

@@ -1,10 +1,8 @@
-from flint.flintlib.arb cimport arb_ptr, arb_struct
+from flint.flintlib.arb_types cimport arb_ptr, arb_struct, mag_t, mag_srcptr, arb_t, arb_srcptr
 from flint.flintlib.fmpz_mat cimport fmpz_mat_t
 from flint.flintlib.fmpq_mat cimport fmpq_mat_t
-from flint.flintlib.mag cimport mag_t, mag_srcptr
 from flint.flintlib.flint cimport ulong, slong, flint_rand_t
 from flint.flintlib.fmpz cimport fmpz_t
-from flint.flintlib.arb cimport arb_t, arb_srcptr
 from flint.flintlib.arb_poly cimport arb_poly_t
 
 cdef extern from "flint/arb_mat.h":

src/flint/flintlib/arb_mat.pxd

@@ -0,0 +1,42 @@
+from flint.flintlib.flint cimport ulong, slong, fmpz_struct
+from flint.flintlib.arf_types cimport arf_struct, arf_ptr
+
+cdef extern from "flint/arb_types.h":
+    ctypedef struct mag_struct:
+        fmpz_struct exp
+        ulong man
+
+    ctypedef mag_struct mag_t[1]
+    ctypedef mag_struct * mag_ptr
+    ctypedef const mag_struct * mag_srcptr
+
+    ctypedef struct arb_struct:
+        arf_struct mid
+        mag_struct rad
+
+    ctypedef arb_struct arb_t[1]
+    ctypedef arb_struct * arb_ptr
+    ctypedef const arb_struct * arb_srcptr
+
+    # Macros
+    cdef arf_ptr arb_midref(const arb_t x)
+    cdef mag_ptr arb_radref(const arb_t x)
+
+    cdef const ulong ARB_STR_MORE
+    cdef const ulong ARB_STR_NO_RADIUS
+    cdef const ulong ARB_STR_CONDENSE
+
+    ctypedef struct arb_mat_struct:
+        arb_ptr entries
+        slong r
+        slong c
+        arb_ptr * rows
+
+    ctypedef arb_mat_struct arb_mat_t[1]
+
+    ctypedef struct arb_poly_struct:
+        arb_ptr coeffs
+        slong alloc
+        slong length
+
+    ctypedef arb_poly_struct arb_poly_t[1]

src/flint/flintlib/arb_types.pxd

@@ -1,27 +1,22 @@
-from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
-from flint.flintlib.flint cimport mp_limb_t, ulong, flint_rand_t, slong
+from flint.flintlib.arb_types cimport mag_t
+from flint.flintlib.arf_types cimport arf_rnd_t, arf_srcptr, arf_t
+from flint.flintlib.flint cimport flint_rand_t, nn_ptr, nn_srcptr, slong, ulong
 from flint.flintlib.fmpq cimport fmpq_t
-from flint.flintlib.mag cimport mag_t
+from flint.flintlib.fmpz_types cimport fmpz_t
 
-cdef extern from "flint/arf.h":
-    ctypedef struct arf_struct:
-        fmpz_struct exp
-        long size
-        mp_limb_t d0
-        mp_limb_t d1
-
-    ctypedef arf_struct arf_t[1]
-    ctypedef arf_struct * arf_ptr
-    ctypedef const arf_struct * arf_srcptr
+# unknown type FILE
+# unknown type mpfr_rnd_t
+# unknown type mpfr_t
+# unknown type mpz_t
 
-    ctypedef int arf_rnd_t
-    cdef arf_rnd_t ARF_RND_DOWN
-    cdef arf_rnd_t ARF_RND_NEAR
-    cdef arf_rnd_t ARF_RND_FLOOR
-    cdef arf_rnd_t ARF_RND_CEIL
-    cdef arf_rnd_t ARF_RND_UP
+# .. macro:: ARF_RND_DOWN
+# .. macro:: ARF_RND_UP
+# .. macro:: ARF_RND_FLOOR
+# .. macro:: ARF_RND_CEIL
+# .. macro:: ARF_RND_NEAR
+# .. macro:: ARF_PREC_EXACT
 
-# from here on is parsed
+cdef extern from "flint/arf.h":
     void arf_init(arf_t x)
     void arf_clear(arf_t x)
     slong arf_allocated_bytes(const arf_t x)
@@ -40,20 +35,19 @@ cdef extern from "flint/arf.h":
     int arf_is_special(const arf_t x)
     int arf_is_finite(const arf_t x)
     void arf_set(arf_t res, const arf_t x)
-#    void arf_set_mpz(arf_t res, const mpz_t x)
-#    void arf_set_fmpz(arf_t res, const fmpz_t x)
+    # void arf_set_mpz(arf_t res, const mpz_t x)
+    void arf_set_fmpz(arf_t res, const fmpz_t x)
     void arf_set_ui(arf_t res, ulong x)
     void arf_set_si(arf_t res, slong x)
-#    void arf_set_mpfr(arf_t res, const mpfr_t x)
-#    void arf_set_fmpr(arf_t res, const fmpr_t x)
+    # void arf_set_mpfr(arf_t res, const mpfr_t x)
     void arf_set_d(arf_t res, double x)
     void arf_swap(arf_t x, arf_t y)
     void arf_init_set_ui(arf_t res, ulong x)
     void arf_init_set_si(arf_t res, slong x)
     int arf_set_round(arf_t res, const arf_t x, slong prec, arf_rnd_t rnd)
     int arf_set_round_si(arf_t res, slong x, slong prec, arf_rnd_t rnd)
     int arf_set_round_ui(arf_t res, ulong x, slong prec, arf_rnd_t rnd)
-#    int arf_set_round_mpz(arf_t res, const mpz_t x, slong prec, arf_rnd_t rnd)
+    # int arf_set_round_mpz(arf_t res, const mpz_t x, slong prec, arf_rnd_t rnd)
     int arf_set_round_fmpz(arf_t res, const fmpz_t x, slong prec, arf_rnd_t rnd)
     void arf_set_si_2exp_si(arf_t res, slong m, slong e)
     void arf_set_ui_2exp_si(arf_t res, ulong m, slong e)
@@ -62,8 +56,7 @@ cdef extern from "flint/arf.h":
     void arf_get_fmpz_2exp(fmpz_t m, fmpz_t e, const arf_t x)
     void arf_frexp(arf_t m, fmpz_t e, const arf_t x)
     double arf_get_d(const arf_t x, arf_rnd_t rnd)
-    void arf_set_fmpz(arf_t x, const fmpz_t res)
-#    int arf_get_mpfr(mpfr_t res, const arf_t x, mpfr_rnd_t rnd)
+    # int arf_get_mpfr(mpfr_t res, const arf_t x, mpfr_rnd_t rnd)
     int arf_get_fmpz(fmpz_t res, const arf_t x, arf_rnd_t rnd)
     slong arf_get_si(const arf_t x, arf_rnd_t rnd)
     int arf_get_fmpz_fixed_fmpz(fmpz_t res, const arf_t x, const fmpz_t e)
@@ -114,8 +107,12 @@ cdef extern from "flint/arf.h":
     void arf_print(const arf_t x)
     void arf_printd(const arf_t x, slong d)
     char * arf_get_str(const arf_t x, slong d)
+    # void arf_fprint(FILE * file, const arf_t x)
+    # void arf_fprintd(FILE * file, const arf_t y, slong d)
     char * arf_dump_str(const arf_t x)
     int arf_load_str(arf_t x, const char * str)
+    # int arf_dump_file(FILE * stream, const arf_t x)
+    # int arf_load_file(arf_t x, FILE * stream)
     void arf_abs(arf_t res, const arf_t x)
     void arf_neg(arf_t res, const arf_t x)
     int arf_neg_round(arf_t res, const arf_t x, slong prec, arf_rnd_t rnd)
@@ -133,17 +130,17 @@ cdef extern from "flint/arf.h":
     int arf_mul(arf_t res, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)
     int arf_mul_ui(arf_t res, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
     int arf_mul_si(arf_t res, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
-#    int arf_mul_mpz(arf_t res, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
+    # int arf_mul_mpz(arf_t res, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
     int arf_mul_fmpz(arf_t res, const arf_t x, const fmpz_t y, slong prec, arf_rnd_t rnd)
     int arf_addmul(arf_t z, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)
     int arf_addmul_ui(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
     int arf_addmul_si(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
-#    int arf_addmul_mpz(arf_t z, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
+    # int arf_addmul_mpz(arf_t z, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
     int arf_addmul_fmpz(arf_t z, const arf_t x, const fmpz_t y, slong prec, arf_rnd_t rnd)
     int arf_submul(arf_t z, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)
     int arf_submul_ui(arf_t z, const arf_t x, ulong y, slong prec, arf_rnd_t rnd)
     int arf_submul_si(arf_t z, const arf_t x, slong y, slong prec, arf_rnd_t rnd)
-#    int arf_submul_mpz(arf_t z, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
+    # int arf_submul_mpz(arf_t z, const arf_t x, const mpz_t y, slong prec, arf_rnd_t rnd)
     int arf_submul_fmpz(arf_t z, const arf_t x, const fmpz_t y, slong prec, arf_rnd_t rnd)
     int arf_fma(arf_t res, const arf_t x, const arf_t y, const arf_t z, slong prec, arf_rnd_t rnd)
     int arf_sosq(arf_t res, const arf_t x, const arf_t y, slong prec, arf_rnd_t rnd)
@@ -165,9 +162,8 @@ cdef extern from "flint/arf.h":
     int arf_complex_mul(arf_t e, arf_t f, const arf_t a, const arf_t b, const arf_t c, const arf_t d, slong prec, arf_rnd_t rnd)
     int arf_complex_mul_fallback(arf_t e, arf_t f, const arf_t a, const arf_t b, const arf_t c, const arf_t d, slong prec, arf_rnd_t rnd)
     int arf_complex_sqr(arf_t e, arf_t f, const arf_t a, const arf_t b, slong prec, arf_rnd_t rnd)
-#    int _arf_get_integer_mpn(mp_ptr y, mp_srcptr xp, mp_size_t xn, slong exp)
-#    int _arf_set_mpn_fixed(arf_t z, mp_srcptr xp, mp_size_t xn, mp_size_t fixn, int negative, slong prec, arf_rnd_t rnd)
+    int _arf_get_integer_mpn(nn_ptr y, nn_srcptr xp, slong xn, slong exp)
+    int _arf_set_mpn_fixed(arf_t z, nn_srcptr xp, slong xn, slong fixn, int negative, slong prec, arf_rnd_t rnd)
     int _arf_set_round_ui(arf_t z, ulong x, int sgnbit, slong prec, arf_rnd_t rnd)
-    int _arf_set_round_uiui(arf_t z, slong * fix, mp_limb_t hi, mp_limb_t lo, int sgnbit, slong prec, arf_rnd_t rnd)
-#    int _arf_set_round_mpn(arf_t z, slong * exp_shift, mp_srcptr x, mp_size_t xn, int sgnbit, slong prec, arf_rnd_t rnd)
-
+    int _arf_set_round_uiui(arf_t z, slong * fix, ulong hi, ulong lo, int sgnbit, slong prec, arf_rnd_t rnd)
+    int _arf_set_round_mpn(arf_t z, slong * exp_shift, nn_srcptr x, slong xn, int sgnbit, slong prec, arf_rnd_t rnd)

src/flint/flintlib/arf.pxd

@@ -0,0 +1,33 @@
+from flint.flintlib.flint cimport fmpz_struct, slong, ulong, nn_ptr
+
+cdef extern from "flint/arf.h":
+    ctypedef enum arf_rnd_t:
+        ARF_RND_DOWN
+        ARF_RND_NEAR
+        ARF_RND_FLOOR
+        ARF_RND_CEIL
+        ARF_RND_UP
+
+cdef extern from "flint/arf_types.h":
+
+    cdef const int ARF_NOPTR_LIMBS
+
+    ctypedef struct mantissa_noptr_struct:
+        ulong d[ARF_NOPTR_LIMBS]
+
+    ctypedef struct mantissa_ptr_struct:
+        slong alloc
+        nn_ptr d
+
+    ctypedef union mantissa_struct:
+        mantissa_noptr_struct noptr
+        mantissa_ptr_struct ptr
+
+    ctypedef struct arf_struct:
+        fmpz_struct exp
+        slong size
+        mantissa_struct d
+
+    ctypedef arf_struct arf_t[1]
+    ctypedef arf_struct * arf_ptr
+    ctypedef const arf_struct * arf_srcptr