gen_external.py : fix wrong longname in generate_lib_from_c_declarations simplify parsing

wscript.py : add _t suffix for added objects

Martin Hermant committed 9 years ago

Commit 0b2643b1 parent e717fae2 files · +9 −14Browse files

Showing the changes to python/lib (1 of 2 files). Show all

Unified · Split

     lib = {}
     for o in cpp_objects:
-        shortname = ''
+        shortname = o
         if o[:6] == 'aubio_':
-            shortname = o[6:-2]  # without aubio_
+            shortname = o[6:-2]  # without aubio_ prefix and _t suffix
-            longname = o[:-2]  # without _t
-        else:  # support object not starting with aubio_ (fvec...)
-            shortname = o
-            longname = shortname
         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:]
+            func_name = fn.split('(')[0].strip().split(' ')[-1]
-            if func_name:
+            if func_name.startswith(fullshortname + '_') or func_name.endswith(fullshortname):
-                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):
                 # print "found", shortname, "in", fn
                 if 'typedef struct ' in fn:
                     lib[shortname]['struct'].append(fn)

Keyboard shortcuts