autogenerate paridecl.pxd

.gitignore

@@ -4,8 +4,8 @@ cypari2/auto_gen.pxi.tmp
 cypari2/auto_gen.pxi
 cypari2/auto_instance.pxi.tmp
 cypari2/auto_instance.pxi
-cypari2/auto_paridecl.pxd.tmp
-cypari2/auto_paridecl.pxd
+cypari2/paridecl.pxd.tmp
+cypari2/paridecl.pxd
 cypari2/closure.c
 cypari2/convert.c
 cypari2/gen.c

autogen/generator.py

@@ -44,12 +44,6 @@
     """
 '''
 
-decl_banner = autogen_top + '''
-from .types cimport *
-
-cdef extern from *:
-'''
-
 
 function_re = re.compile(r"^[A-Za-z][A-Za-z0-9_]*$")
 function_blacklist = {"O",  # O(p^e) needs special parser support
@@ -75,9 +69,29 @@ class PariFunctionGenerator(object):
     def __init__(self):
         self.gen_filename = os.path.join('cypari2', 'auto_gen.pxi')
         self.instance_filename = os.path.join('cypari2', 'auto_instance.pxi')
-        self.decl_filename = os.path.join('cypari2', 'auto_paridecl.pxd')
+        self.decl_filename = os.path.join('cypari2', 'paridecl.pxd')
+
+    def write_paridecl_no_desc(self, D):
+        r"""
+        Write the template ``template_paridecl.pxd`` into the declaration file
+        after removing all functions from ``D`` (that are obtained from
+        ``pari.desc``).
+        """
+        fnc = re.compile("    (int|long|void|GEN) +([A-Za-z][0-9A-Za-z_]*)\(.*\)")
+
+        functions = set(f.get('cname') for f in D)
+
+        with open('autogen/template_paridecl.pxd') as template:
+            for line in template.read().split('\n'):
+                match = fnc.match(line)
+                if match:
+                    out_type, fname = match.groups()
+                    if fname in functions:
+                        continue
+                self.decl_file.write(line)
+                self.decl_file.write("\n")
 
-    def can_handle_function(self, function, cname="", **kwds):
+    def can_handle_function(self, function, cname="", prototype="", help="", **kwds):
         """
         Can we actually handle this function?
 
@@ -107,6 +121,10 @@ def can_handle_function(self, function, cname="", **kwds):
         if sec == "programming/control":
             # Skip if, return, break, ...
             return False
+        try:
+            args, ret = parse_prototype(prototype, help)
+        except NotImplementedError:
+            return  # Skip unsupported prototype codes
         return True
 
     def handle_pari_function(self, function, cname, prototype="", help="", obsolete=None, **kwds):
@@ -201,12 +219,8 @@ def bernvec(self, long x):
                     return new_gen(_ret)
             <BLANKLINE>
         """
-        try:
-            args, ret = parse_prototype(prototype, help)
-        except NotImplementedError:
-            return  # Skip unsupported prototype codes
-
         doc = get_rest_doc(function)
+        args, ret = parse_prototype(prototype, help)
 
         self.write_declaration(cname, args, ret, self.decl_file)
 
@@ -293,31 +307,40 @@ def __call__(self):
         """
         D = read_pari_desc()
         D = sorted(D.values(), key=lambda d: d['function'])
-        sys.stdout.write("Generating PARI functions:")
 
         self.gen_file = io.open(self.gen_filename + '.tmp', 'w', encoding='utf-8')
         self.gen_file.write(gen_banner)
         self.instance_file = io.open(self.instance_filename + '.tmp', 'w', encoding='utf-8')
         self.instance_file.write(instance_banner)
         self.decl_file = io.open(self.decl_filename + '.tmp', 'w', encoding='utf-8')
-        self.decl_file.write(decl_banner)
-
-        # Check for availability of hi-res SVG plotting. This requires
-        # PARI-2.10 or later.
-        have_plot_svg = False
 
+        sys.stdout.write("Non handled PARI functions:")
+        DD = []
         for v in D:
             func = v["function"]
             if self.can_handle_function(**v):
-                sys.stdout.write(" %s" % func)
-                sys.stdout.flush()
-                self.handle_pari_function(**v)
-                if func == "plothraw":
-                    have_plot_svg = True
+                DD.append(v)
             else:
                 sys.stdout.write(" (%s)" % func)
         sys.stdout.write("\n")
 
+        self.write_paridecl_no_desc(DD)
+
+
+        sys.stdout.write("Generating PARI functions:")
+
+        # Check for availability of hi-res SVG plotting. This requires
+        # PARI-2.10 or later.
+        have_plot_svg = False
+        for v in DD:
+            func = v["function"]
+            sys.stdout.write(" %s" % func)
+            sys.stdout.flush()
+            self.handle_pari_function(**v)
+            if func == "plothraw":
+                have_plot_svg = True
+        sys.stdout.write("\n")
+
         self.instance_file.write("DEF HAVE_PLOT_SVG = {}".format(have_plot_svg))
 
         self.gen_file.close()

autogen/template_paridecl.pxd

@@ -1,11 +1,9 @@
 # distutils: libraries = gmp pari
 """
-Declarations for non-inline functions from PARI.
+Declarations of PARI functions.
 
 This file contains all declarations from headers/paridecl.h from
-the PARI distribution, except the inline functions which are in
-declinl.pxi (that file is automatically included by this file).
-
+the PARI distribution.
 
 AUTHORS:
 
@@ -20,6 +18,9 @@ AUTHORS:
 
  - Jeroen Demeyer (2014-09-19): upgrade to PARI 2.8 (:trac:`16997`)
 
+ - Vincent Delecroix (2017-2018): auto-generate part of the declarations
+   from ``pari.desc``
+
 """
 
 #*****************************************************************************
@@ -5168,7 +5169,6 @@ cdef extern from *:     # PARI headers already included by types.pxd
     void   pari_err_VAR(const char *f, GEN x, GEN y)
     void   pari_err_ROOTS0(const char *f)
 
-# Auto-generated declarations. There are taken from the PARI version
-# on the system, so they more up-to-date than the above. In case of
-# conflicting declarations, auto_paridecl should have priority.
-from .auto_paridecl cimport *
+    #########################################################
+    # All functions below are auto-generated from pari.desc #
+    #########################################################