You could also use libclang to parse and codegen the extra braces. https://clang.llvm.org/docs/Tooling.html https://clang.llvm.org/docs/Tooling.html That way

You could also use libclang to parse and codegen the extra braces. https://clang.llvm.org/docs/Tooling.html https://clang.llvm.org/docs/Tooling.html That way you don't have to maintain your own branch of clang.