wscript.py : add _t suffix for added objects
Showing the changes to python (1 of 2 files). Show all
Unified · Split
| @@ -174,27 +174,22 @@ def generate_lib_from_c_declarations(cpp_objects, c_declarations): · 173 unmodified lines | ||
| 174 | 174 | lib = {} |
| 175 | 175 | |
| 176 | 176 | for o in cpp_objects: |
| 177 | − shortname = '' | |
| 177 | + shortname = o | |
| 178 | 178 | if o[:6] == 'aubio_': |
| 179 | − shortname = o[6:-2] # without aubio_ | |
| 180 | − longname = o[:-2] # without _t | |
| 181 | − else: # support object not starting with aubio_ (fvec...) | |
| 182 | − shortname = o | |
| 183 | − longname = shortname | |
| 179 | + shortname = o[6:-2] # without aubio_ prefix and _t suffix | |
| 184 | 180 | |
| 185 | 181 | if shortname in skip_objects: |
| 186 | 182 | continue |
| 183 | + | |
| 187 | 184 | lib[shortname] = {'struct': [], 'new': [], 'del': [], 'do': [], 'get': [], 'set': [], 'other': []} |
| 188 | − lib[shortname]['longname'] = longname | |
| 185 | + lib[shortname]['longname'] = o | |
| 189 | 186 | lib[shortname]['shortname'] = shortname |
| 190 | 187 | |
| 188 | + fullshortname = o[:-2] # name without _t suffix | |
| 189 | + | |
| 191 | 190 | for fn in c_declarations: |
| 192 | − func_name = fn.split('(')[0].strip().split(' ')[1:] | |
| 193 | − if func_name: | |
| 194 | − func_name = func_name[-1] | |
| 195 | − else: | |
| 196 | − raise NameError('Warning : error while parsing : unexpected line %s' % fn) | |
| 197 | − if func_name.startswith(longname + '_') or func_name.endswith(longname): | |
| 191 | + func_name = fn.split('(')[0].strip().split(' ')[-1] | |
| 192 | + if func_name.startswith(fullshortname + '_') or func_name.endswith(fullshortname): | |
| 198 | 193 | # print "found", shortname, "in", fn |
| 199 | 194 | if 'typedef struct ' in fn: |
| 200 | 195 | lib[shortname]['struct'].append(fn) |