Changeset 15a43e0

Timestamp:

May 29, 2017, 7:28:48 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:

5674833

Parents:

deaf39e

Message:

gen_external.py : relax a bit parsing of preprocessor code -> one line per {} block no matter if they are actually at end of line (conflict with structs)

File:

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

python/lib/gen_external.py

@@ -109 +109 @@
     i = 1
     while 1:
-        if i >= len(cpp_output): break
-        if cpp_output[i-1].endswith(',') or cpp_output[i-1].endswith('{') or cpp_output[i].startswith('}'):
+        if i >= len(cpp_output):break
+        if ('{' in cpp_output[i - 1]) and (not '}' in cpp_output[i - 1]) or (not ';' in cpp_output[i - 1]):
             cpp_output[i] = cpp_output[i-1] + ' ' + cpp_output[i]
             cpp_output.pop(i-1)
+        elif ('}' in cpp_output[i]):
+            cpp_output[i] = cpp_output[i - 1] + ' ' + cpp_output[i]
+            cpp_output.pop(i - 1)
         else:
             i += 1