Fix rst_to_pxd.py for (void) parameter and macros

Author: oscarbenjamin

bin/rst_to_pxd.py

@@ -54,6 +54,12 @@
 import_dict = {}
 # gr_domains.rst lists functions that are in gr.h
 doc_to_header = {'flint/gr_domains': 'flint/gr'}
+void_parameter_list = re.compile(r"\(\s*void\s*\)$")
+macro_declarations = {
+    'flint/arf': {
+        'ARF_PREC_EXACT': 'cdef const slong ARF_PREC_EXACT',
+    },
+}
 
 
 
@@ -115,6 +121,8 @@ def clean_types(function):
     ret = function.strip()
     for old, new in rename_types:
         ret = re.sub(old, new, ret)
+    # Cython expects zero-argument functions to use () rather than (void).
+    ret = re.sub(void_parameter_list, "()", ret)
     return ret
 
 
@@ -197,6 +205,12 @@ def generate_pxd_file(h_name, opts):
     with open(os.path.join(docdir, name + ".rst")) as f:
         l, macros = get_functions(f)
         unknown_types = gen_imports(l)
+        macro_defs = []
+        declared_macros = macro_declarations.get(h_name, {})
+        for macro in macros:
+            macro_name = macro.split("::", 1)[1].strip()
+            if macro_name in declared_macros:
+                macro_defs.append(declared_macros[macro_name])
         print()
         for t in unknown_types:
             print("# unknown type " + t)
@@ -205,6 +219,8 @@ def generate_pxd_file(h_name, opts):
             print("# " + m)
         print()
         print(r'cdef extern from "' + h_name + r'.h":')
+        for declaration in macro_defs:
+            print("    " + declaration)
         for f in l:
             if has_types(f, unknown_types):
                 print("    # " + f)

src/flint/flintlib/functions/flint.pxd

@@ -29,7 +29,7 @@ cdef extern from "flint/flint.h":
     void flint_rand_init(flint_rand_t state)
     void flint_rand_clear(flint_rand_t state)
     void flint_set_num_threads(int num_threads)
-    # int flint_get_num_threads(void)
+    int flint_get_num_threads()
     int flint_set_num_workers(int num_workers)
     void flint_reset_num_workers(int num_workers)
     # int flint_printf(const char * format, ...)
@@ -40,7 +40,7 @@ cdef extern from "flint/flint.h":
     # int flint_scanf(const char * str, ...)
     # int flint_fscanf(FILE * f, const char * str, ...)
     # int flint_sscanf(const char * s, const char * str, ...)
-    # void flint_abort(void)
+    void flint_abort()
     # void flint_throw(flint_err_t exc, const char * msg, ...)
     # void flint_set_abort(void (* func)(void))
     # void flint_set_throw(void (* func)(flint_err_t, const char *, va_list))

src/flint/flintlib/functions/fmpz.pxd

@@ -20,7 +20,7 @@ from flint.flintlib.types.fmpz cimport fmpz_factor_t, fmpz_preinvn_t
 cdef extern from "flint/fmpz.h":
     # fmpz_struct PTR_TO_COEFF(mpz_ptr ptr)
     # mpz_ptr COEFF_TO_PTR(fmpz_struct f)
-    # mpz_ptr _fmpz_new_mpz(void)
+    # mpz_ptr _fmpz_new_mpz()
     void _fmpz_clear_mpz(fmpz_struct f)
     void _fmpz_cleanup_mpz_content()
     void _fmpz_cleanup()

src/flint/flintlib/functions/gr_generic.pxd

@@ -8,22 +8,22 @@ from flint.flintlib.types.gr cimport gr_ctx_t, gr_ptr, gr_srcptr, gr_stream_t, g
 # .. macro :: GR_PARSE_RING_EXPONENTS
 
 cdef extern from "flint/gr_generic.h":
-    void gr_generic_init(void)
-    void gr_generic_clear(void)
-    void gr_generic_swap(void)
-    void gr_generic_randtest(void)
-    void gr_generic_write(void)
-    void gr_generic_zero(void)
-    void gr_generic_one(void)
-    void gr_generic_equal(void)
-    void gr_generic_set(void)
-    void gr_generic_set_si(void)
-    void gr_generic_set_ui(void)
-    void gr_generic_set_fmpz(void)
-    void gr_generic_neg(void)
-    void gr_generic_add(void)
-    void gr_generic_sub(void)
-    void gr_generic_mul(void)
+    void gr_generic_init()
+    void gr_generic_clear()
+    void gr_generic_swap()
+    void gr_generic_randtest()
+    void gr_generic_write()
+    void gr_generic_zero()
+    void gr_generic_one()
+    void gr_generic_equal()
+    void gr_generic_set()
+    void gr_generic_set_si()
+    void gr_generic_set_ui()
+    void gr_generic_set_fmpz()
+    void gr_generic_neg()
+    void gr_generic_add()
+    void gr_generic_sub()
+    void gr_generic_mul()
     void gr_generic_ctx_clear(gr_ctx_t ctx)
     void gr_generic_set_shallow(gr_ptr res, gr_srcptr x, const gr_ctx_t ctx)
     int gr_generic_write_n(gr_stream_t out, gr_srcptr x, slong n, gr_ctx_t ctx)

src/flint/flintlib/functions/gr_implementing.pxd

@@ -6,8 +6,8 @@ from flint.flintlib.types.gr cimport gr_ctx_t, gr_funcptr, truth_t
 
 cdef extern from "flint/gr_implementing.h":
     # void gr_method_tab_init(gr_funcptr * methods, gr_method_tab_input * tab)
-    int gr_not_implemented(void)
-    int gr_not_in_domain(void)
+    int gr_not_implemented()
+    int gr_not_in_domain()
     truth_t gr_generic_ctx_predicate(gr_ctx_t ctx)
     truth_t gr_generic_ctx_predicate_true(gr_ctx_t ctx)
     truth_t gr_generic_ctx_predicate_false(gr_ctx_t ctx)