put some braces back

diff --git a/qcsrc/lib/iter.qh b/qcsrc/lib/iter.qh
index 4eae6d5d393ccc6e9e33453a33b0658c1a557c80..798d858743dc290031f9c40dc056c63474aa77ea 100644 (file)
--- a/qcsrc/lib/iter.qh
+++ b/qcsrc/lib/iter.qh
@@ -54,8 +54,8 @@
 
 #define STRING_ITERATOR_GET(this) str2chr(this##_s, this##_i++)
 #define STRING_ITERATOR_PEEK(this) str2chr(this##_s, this##_i)
-#define STRING_ITERATOR_NEXT(this) MACRO_BEGIN ++this##_i; MACRO_END
-#define STRING_ITERATOR_UNGET(this) MACRO_BEGIN --this##_i; MACRO_END
+#define STRING_ITERATOR_NEXT(this) MACRO_BEGIN { ++this##_i; } MACRO_END
+#define STRING_ITERATOR_UNGET(this) MACRO_BEGIN { --this##_i; } MACRO_END
 #define STRING_ITERATOR_SAVE(this) this##_i
 #define STRING_ITERATOR_LOAD(this, n) MACRO_BEGIN this##_i = n; MACRO_END
 

diff --git a/qcsrc/lib/test.qh b/qcsrc/lib/test.qh
index 549c9447c4285e0fae62a0081ff23813fb7e42d9..f0fef90c84d0070e9337115efdfb2dc677635f62 100644 (file)
--- a/qcsrc/lib/test.qh
+++ b/qcsrc/lib/test.qh
@@ -15,7 +15,7 @@
 #define SUCCEED() (TEST_ok = true)
 
 /** Add a failure, but continue */
-#define ADD_FAILURE(msg) MACRO_BEGIN ++TEST_failed; LOG_WARN(msg); MACRO_END
+#define ADD_FAILURE(msg) MACRO_BEGIN { ++TEST_failed; LOG_WARN(msg); } MACRO_END
 
 /** Add a failure and return */
 #define FAIL(msg) _TEST_ASSERT(ADD_FAILURE(msg))

diff --git a/qcsrc/tools/unc-macro-fix.py b/qcsrc/tools/unc-macro-fix.py
index c2ada261f0b02557271137d8528ceaac750f2415..898583b02c4836dc51eccc70f0e34cb110e39821 100755 (executable)
--- a/qcsrc/tools/unc-macro-fix.py
+++ b/qcsrc/tools/unc-macro-fix.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
-# removes redundant { and } from macros because uncrustify is too dumb to indent them properly (or even not touch them)
+# Removes redundant { and } from macros because uncrustify is too dumb to indent them properly (or even not touch them).
+# Actually, after running this, you might wanna put some back, for cases like `MACRO_BEGIN { ++this##_i; } MACRO_END`,
+# otherwise it ends up like MACRO_BEGIN++ ... sigh'
 
 # all those fancy unix utilities like grep, sed and awk are either woefully inadequate for this or just completely
 # unreadable with their arcane syntaxes - and yes, the plural is intentional because why extend existing tools

diff --git a/qcsrc/tools/uncrustify-unmodified.py b/qcsrc/tools/uncrustify-unmodified.py
index 91179f4f14fa6e2b88d757cb2a8d67cba707fe97..a346d46cbd17b7e49a515e4d74aa505205de9be5 100755 (executable)
--- a/qcsrc/tools/uncrustify-unmodified.py
+++ b/qcsrc/tools/uncrustify-unmodified.py
@@ -22,7 +22,8 @@ def main():
 
        # get all remote branches - those would potentially get merge conflicts if we formatted everything
        branches = run('git branch --list --remotes')
-       branches = [b.strip() for b in branches]
+       # strip the leading spaces and ignore branches that are presumably used for debugging uncrustify
+       branches = [b.strip() for b in branches if "uncrustify" not in b]
        branches.remove('origin/HEAD -> origin/master')
        branches.remove('origin/master')