Changes in python/lib/gen_code.py [21067f9:9b23815e]

File:

• python/lib/gen_code.py (modified) (3 diffs)

python/lib/gen_code.py

@@ -463 +463 @@
 """.format(**self.__dict__)
         for set_param in self.prototypes['set']:
-            params = get_params_types_names(set_param)[1:]
-            param = self.shortname.split('_set_')[-1]
-            paramdecls = "".join(["""
-   {0} {1};""".format(p['type'], p['name']) for p in params])
+            params = get_params_types_names(set_param)[1]
+            paramtype = params['type']
             method_name = get_name(set_param)
             param = method_name.split('aubio_'+self.shortname+'_set_')[-1]
-            refs = ", ".join(["&%s" % p['name'] for p in params])
-            paramlist = ", ".join(["%s" % p['name'] for p in params])
-            if len(params):
-                paramlist = "," + paramlist
-            pyparamtypes = ''.join([pyargparse_chars[p['type']] for p in params])
+            pyparamtype = pyargparse_chars[paramtype]
             out += """
 static PyObject *
@@ -479 +473 @@
 {{
   uint_t err = 0;
-  {paramdecls}
-""".format(param = param, paramdecls = paramdecls, **self.__dict__)
-
-            if len(refs) and len(pyparamtypes):
-                out += """
-
-  if (!PyArg_ParseTuple (args, "{pyparamtypes}", {refs})) {{
+  {paramtype} {param};
+
+  if (!PyArg_ParseTuple (args, "{pyparamtype}", &{param})) {{
     return NULL;
   }}
-""".format(pyparamtypes = pyparamtypes, refs = refs)
-
-            out += """
-  err = aubio_{shortname}_set_{param} (self->o {paramlist});
+  err = aubio_{shortname}_set_{param} (self->o, {param});
 
   if (err > 0) {{
@@ -506 +493 @@
   Py_RETURN_NONE;
 }}
-""".format(param = param, refs = refs, paramdecls = paramdecls,
-        pyparamtypes = pyparamtypes, paramlist = paramlist, **self.__dict__)
+""".format(param = param, paramtype = paramtype, pyparamtype = pyparamtype, **self.__dict__)
         return out