Changeset 0b2643b

Timestamp:

May 30, 2017, 1:12:40 AM (8 years ago)

Author:

Martin Hermant <martin.hermant@gmail.com>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

2f5f1e4

Parents:

e717fae

Message:

gen_external.py :

fix wrong longname in generate_lib_from_c_declarations
simplify parsing

wscript.py : add _t suffix for added objects

Files:

• python/lib/gen_external.py (modified) (1 diff)
• wscript (modified) (1 diff)

python/lib/gen_external.py

@@ -175 +175 @@
 
     for o in cpp_objects:
-        shortname = ''
+        shortname = o
         if o[:6] == 'aubio_':
-            shortname = o[6:-2]  # without aubio_
-            longname = o[:-2]  # without _t
-        else:  # support object not starting with aubio_ (fvec...)
-            shortname = o
-            longname = shortname
+            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'] = longname
+        lib[shortname]['longname'] = o
         lib[shortname]['shortname'] = shortname
 
+        fullshortname = o[:-2]  # name without _t suffix
+
         for fn in c_declarations:
-            func_name = fn.split('(')[0].strip().split(' ')[1:]
-            if func_name:
-                func_name = func_name[-1]
-            else:
-                raise NameError('Warning : error while parsing : unexpected line %s' % fn)
-            if func_name.startswith(longname + '_') or func_name.endswith(longname):
+            func_name = fn.split('(')[0].strip().split(' ')[-1]
+            if func_name.startswith(fullshortname + '_') or func_name.endswith(fullshortname):
                 # print "found", shortname, "in", fn
                 if 'typedef struct ' in fn:

wscript

@@ -243 +243 @@
         c_decls = get_c_declarations(usedouble=False) #emscripten can't use double
         objects = get_cpp_objects_from_c_declarations(c_decls)
-        objects+=['fvec']
+        objects+=['fvec_t']
         lib =  generate_lib_from_c_declarations(objects,c_decls)
         exported_funcnames = get_all_func_names_from_lib(lib)