Changeset 150ec2d

Timestamp:

May 29, 2017, 10:03:15 PM (7 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:

341585b

Parents:

5674833

Message:

gen_external.py :

rename cpp_output to c_declarations
make pre processing parsing part of get_cpp_objects a distinct function get_c_declarations

File:

• python/lib/gen_external.py (modified) (5 diffs)

python/lib/gen_external.py

@@ -76 +76 @@
     return cpp_cmd
 
-def get_cpp_objects(header=header, usedouble=False):
+
+def get_c_declarations(header=header, usedouble=False):
+    ''' return a dense and preprocessed  string of all c declarations implied by aubio.h
+    '''
     cpp_cmd = get_preprocessor()
 
@@ -119 +122 @@
             i += 1
 
-    typedefs = filter(lambda y: y.startswith ('typedef struct _aubio'), cpp_output)
-
+    return cpp_output
+
+def get_cpp_objects_from_c_declarations(c_declarations):
+    typedefs = filter(lambda y: y.startswith ('typedef struct _aubio'), c_declarations)
     cpp_objects = [a.split()[3][:-1] for a in typedefs]
-
-    return cpp_output, cpp_objects
-
-
-def analyze_cpp_output(cpp_objects, cpp_output):
+    return cpp_objects
+
+def analyze_c_declarations(cpp_objects, c_declarations):
     lib = {}
 
@@ -145 +148 @@
         valid_funcname_part = ['_'+longname,longname+'_']
 
-        for fn in cpp_output:
+        for fn in c_declarations:
             func_name = fn.split('(')[0].strip().split(' ')[1:]
             if func_name:
@@ -170 +173 @@
     return lib
 
-def print_cpp_output_results(lib, cpp_output):
-    for fn in cpp_output:
+def print_c_declarations_results(lib, c_declarations):
+    for fn in c_declarations:
         found = 0
         for o in lib:
@@ -194 +197 @@
     elif not overwrite: return sorted(glob.glob(os.path.join(output_path, '*.c')))
 
-    cpp_output, cpp_objects = get_cpp_objects(header, usedouble=usedouble)
-
-    lib = analyze_cpp_output(cpp_objects, cpp_output)
-    # print_cpp_output_results(lib, cpp_output)
+    c_declarations = get_c_declarations(header, usedouble=usedouble)
+    cpp_objects = get_cpp_objects_from_c_declarations(c_declarations)
+
+    lib = analyze_c_declarations(cpp_objects, c_declarations)
+    # print_c_declarations_results(lib, c_declarations)
 
     sources_list = []