support & in prototype

Author: videlec

autogen/args.py

@@ -15,7 +15,7 @@
 from __future__ import unicode_literals
 
 # Some replacements for reserved words
-replacements = {'char': 'character'}
+replacements = {'char': 'character', 'return': 'return_value'}
 
 class PariArgument(object):
     """
@@ -339,6 +339,29 @@ def c_convert_code(self):
         s += "            {name} = precdl  # Global PARI series precision\n"
         return s.format(name=self.name)
 
+class PariArgumentGENPointer(PariArgumentObject):
+    default = "NULL"
+    def _typerepr(self):
+        return "GEN*"
+    def ctype(self):
+        return "GEN*"
+    def convert_code(self):
+        """
+        Conversion to NULL or Gen
+        """
+        s  = "        cdef bint _have_{name} = ({name} is not None)\n"
+        s += "        if _have_{name}:\n"
+        s += "            raise NotImplementedError(\"optional argument {name} not available\")\n"
+        return s.format(name=self.name)
+    def c_convert_code(self):
+        """
+        Conversion Gen -> GEN
+        """
+        s  = "        cdef GEN * {tmp} = NULL\n"
+        return s.format(name=self.name, tmp=self.tmpname)
+    def call_code(self):
+        return self.tmpname
+
 
 pari_arg_types = {
         'G': PariArgumentGEN,
@@ -351,9 +374,9 @@ def c_convert_code(self):
         'p': PariArgumentPrec,
         'b': PariArgumentBitprec,
         'P': PariArgumentSeriesPrec,
+        '&': PariArgumentGENPointer,
 
     # Codes which are known but not actually supported yet
-        '&': None,
         'V': None,
         'I': None,
         'E': None,

autogen/parser.py

@@ -21,7 +21,7 @@
 from .paths import pari_share
 
 paren_re = re.compile(r"[(](.*)[)]")
-argname_re = re.compile(r"[ {]*([A-Za-z_][A-Za-z0-9_]*)")
+argname_re = re.compile(r"[ {]*&?([A-Za-z_][A-Za-z0-9_]*)")
 
 def read_pari_desc():
     """
@@ -101,6 +101,10 @@ def parse_prototype(proto, help, initial_args=[]):
         >>> help = 'qfbred(x,{flag=0},{d},{isd},{sd})'
         >>> parse_prototype(proto, help)
         ([GEN x, long flag=0, GEN d=NULL, GEN isd=NULL, GEN sd=NULL], GEN)
+        >>> proto = "GD&"
+        >>> help = "sqrtint(x,{&r})"
+        >>> parse_prototype(proto, help)
+        ([GEN x, GEN* r=NULL], GEN)
         >>> parse_prototype("lp", "foo()", [str("TEST")])
         (['TEST', prec precision=0], long)
     """