gen_external.py : pass skip_object as member of function to allow custom skip_objects lists

Martin Hermant committed 9 years ago

Commit 51ca6151 parent 6e5c03a1 file · +6 −6Browse files

Showing the changes to python (1 of 1 file). Show all

Unified · Split

 #include "aubio-types.h"
 """
-skip_objects = [
+default_skip_objects = [
     # already in ext/
     'fft',
     'pvoc',
     return cpp_output
-def get_cpp_objects_from_c_declarations(c_declarations):
+def get_cpp_objects_from_c_declarations(c_declarations,skip_objects = None):
+    if skip_objects==None:
+        skip_objects = default_skip_objects
     typedefs = filter(lambda y: y.startswith('typedef struct _aubio'), c_declarations)
     cpp_objects = [a.split()[3][:-1] for a in typedefs]
-    return cpp_objects
+    cpp_objects_filtered = filter(lambda y: not y[6:-2] in skip_objects, cpp_objects)
+    return cpp_objects_filtered
 def get_all_func_names_from_lib(lib, depth=0):
         if o[:6] == 'aubio_':
             shortname = o[6:-2]  # without aubio_ prefix and _t suffix
-        if shortname in skip_objects:
-            continue
         lib[shortname] = {'struct': [], 'new': [], 'del': [], 'do': [], 'get': [], 'set': [], 'other': []}
         lib[shortname]['longname'] = o
         lib[shortname]['shortname'] = shortname

Keyboard shortcuts