bindings: auto-generate bernoulli and dirichlet

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -28,8 +28,8 @@ modules=(
     "arb"
     "arf"
     "arith"
-    #"bernoulli"
-    #"dirichlet"
+    "bernoulli"
+    "dirichlet"
     #"fmpq_mat"
     #"fmpq_mpoly_factor"
     #"fmpq_mpoly"

src/flint/flintlib/acb_dirichlet.pxd

@@ -1,9 +1,9 @@
-from flint.flintlib.dirichlet cimport dirichlet_char_t, dirichlet_group_t
 from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
 from flint.flintlib.types.acb_dirichlet cimport acb_dirichlet_hurwitz_precomp_t, acb_dirichlet_roots_t
 from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_t
 from flint.flintlib.types.arf cimport arf_t
+from flint.flintlib.types.dirichlet cimport dirichlet_char_t, dirichlet_group_t
 from flint.flintlib.types.flint cimport slong, ulong
 from flint.flintlib.types.fmpz cimport fmpz_t
 

src/flint/flintlib/bernoulli.pxd

@@ -1,9 +1,11 @@
-from flint.flintlib.types.flint cimport ulong, slong
-from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
-from flint.flintlib.fmpz cimport fmpz_t
+from flint.flintlib.fmpq cimport fmpq_struct, fmpq_t
+from flint.flintlib.types.flint cimport slong, ulong
+from flint.flintlib.types.fmpz cimport fmpz_t
+
+# unknown type bernoulli_rev_t
+
 
 cdef extern from "flint/bernoulli.h":
-# from here on is parsed
     # void bernoulli_rev_init(bernoulli_rev_t iter, ulong n)
     # void bernoulli_rev_next(fmpz_t numer, fmpz_t denom, bernoulli_rev_t iter)
     # void bernoulli_rev_clear(bernoulli_rev_t iter)
@@ -15,4 +17,3 @@ cdef extern from "flint/bernoulli.h":
     void _bernoulli_fmpq_ui_multi_mod(fmpz_t num, fmpz_t den, ulong n, double alpha)
     void _bernoulli_fmpq_ui(fmpz_t num, fmpz_t den, ulong n)
     void bernoulli_fmpq_ui(fmpq_t b, ulong n)
-

src/flint/flintlib/dirichlet.pxd

@@ -1,34 +1,16 @@
-from flint.flintlib.types.flint cimport ulong, slong
-from flint.flintlib.nmod cimport nmod_t
+from flint.flintlib.types.dirichlet cimport dirichlet_char_t, dirichlet_group_t
+from flint.flintlib.types.flint cimport slong, ulong
 
-cdef extern from "flint/dirichlet.h":
-    ctypedef struct dirichlet_group_struct:
-        ulong q
-        ulong q_even
-        nmod_t mod
-        ulong rad_q
-        ulong phi_q
-        long neven
-        long num
-        ulong expo
-        void * P
-        ulong * generators
-        ulong * PHI
-    ctypedef dirichlet_group_struct dirichlet_group_t[1]
 
-    ctypedef struct dirichlet_char_struct:
-        ulong n
-        ulong * log
-    ctypedef dirichlet_char_struct dirichlet_char_t[1]
 
-# from here on is parsed
+cdef extern from "flint/dirichlet.h":
     int dirichlet_group_init(dirichlet_group_t G, ulong q)
     void dirichlet_subgroup_init(dirichlet_group_t H, const dirichlet_group_t G, ulong h)
     void dirichlet_group_clear(dirichlet_group_t G)
     ulong dirichlet_group_size(const dirichlet_group_t G)
     ulong dirichlet_group_num_primitive(const dirichlet_group_t G)
     void dirichlet_group_dlog_precompute(dirichlet_group_t G, ulong num)
-    void dirichlet_group_dlog_clear(dirichlet_group_t G, ulong num)
+    void dirichlet_group_dlog_clear(dirichlet_group_t G)
     void dirichlet_char_init(dirichlet_char_t chi, const dirichlet_group_t G)
     void dirichlet_char_clear(dirichlet_char_t chi)
     void dirichlet_char_print(const dirichlet_group_t G, const dirichlet_char_t chi)
@@ -53,9 +35,6 @@ cdef extern from "flint/dirichlet.h":
     ulong dirichlet_order_char(const dirichlet_group_t G, const dirichlet_char_t x)
     int dirichlet_char_is_real(const dirichlet_group_t G, const dirichlet_char_t chi)
     int dirichlet_char_is_primitive(const dirichlet_group_t G, const dirichlet_char_t chi)
-
-    cdef ulong DIRICHLET_CHI_NULL
-
     ulong dirichlet_pairing(const dirichlet_group_t G, ulong m, ulong n)
     ulong dirichlet_pairing_char(const dirichlet_group_t G, const dirichlet_char_t chi, const dirichlet_char_t psi)
     ulong dirichlet_chi(const dirichlet_group_t G, const dirichlet_char_t chi, ulong n)

src/flint/flintlib/types/dirichlet.pxd

@@ -0,0 +1,26 @@
+from flint.flintlib.types.flint cimport ulong
+from flint.flintlib.nmod cimport nmod_t
+
+
+cdef extern from "flint/dirichlet.h":
+
+    ctypedef struct dirichlet_group_struct:
+        ulong q
+        ulong q_even
+        nmod_t mod
+        ulong rad_q
+        ulong phi_q
+        long neven
+        long num
+        ulong expo
+        void * P
+        ulong * generators
+        ulong * PHI
+    ctypedef dirichlet_group_struct dirichlet_group_t[1]
+
+    ctypedef struct dirichlet_char_struct:
+        ulong n
+        ulong * log
+    ctypedef dirichlet_char_struct dirichlet_char_t[1]
+
+    cdef ulong DIRICHLET_CHI_NULL

src/flint/types/dirichlet.pyx

@@ -6,6 +6,7 @@ from flint.types.fmpz cimport fmpz
 from flint.flintlib.ulong_extras cimport n_gcd
 from flint.flintlib.fmpz cimport fmpz_get_ui
 from flint.flintlib.dirichlet cimport *
+from flint.flintlib.types.dirichlet cimport DIRICHLET_CHI_NULL
 from flint.flintlib.acb_dirichlet cimport *
 
 cdef dict _dirichlet_group_cache = {}