X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/2edecb46edfcdc4b25c9d12bcfe23a5d66ec3f33..491f4344adf0c5cc1f8b0991da77a5f63f5c287a:/utils/t/control-test.c

diff --git a/utils/t/control-test.c b/utils/t/control-test.c
index d69572b..0f47e26 100644
--- a/utils/t/control-test.c
+++ b/utils/t/control-test.c
@@ -55,9 +55,9 @@ static void laststep(int s, const char *where)
 
 #define FORELSE(head)							\
 			MC_GOTO(top)					\
-  MC_LABEL(out)		MC_ACT({ ; })					\
+  MC_LABEL(out)		MC_ACT(;)					\
   MC_LABEL(top)		ALLOWELSE(els)					\
-			AFTER(outer, { GOELSE(els); })			\
+			AFTER(outer, GOELSE(els))			\
 			for (head)					\
 			  WRAP(inner, { ; },				\
 				      { ; },				\
@@ -94,17 +94,17 @@ int main(void)
 {
   int i;
 
-  BEFORE(before0, { STEP(0); }) STEP(1);
-  AFTER(after0, { STEP(3); }) STEP(2);
+  BEFORE(before0, STEP(0)) STEP(1);
+  AFTER(after0, STEP(3)) STEP(2);
   LASTSTEP(4);
 
-  WRAP(wrap0, { STEP(0); }, { STEP(2); }, { MISSTEP; }) STEP(1);
-  WRAP(wrap1, { STEP(3); }, { MISSTEP; }, { STEP(5); }) { STEP(4); break; }
+  WRAP(wrap0, STEP(0), STEP(2), MISSTEP) STEP(1);
+  WRAP(wrap1, STEP(3), MISSTEP, STEP(5)) { STEP(4); break; }
   LASTSTEP(6);
 
   STEP(0);
   for (;;) {
-    AFTER(after1, { STEP(2); break; }) STEP(1);
+    AFTER(after1, STEP(2); break) STEP(1);
     MISSTEP; break;
   }
   LASTSTEP(3);
@@ -124,8 +124,8 @@ int main(void)
   LASTSTEP(11);
 
 #define TEST								\
-			MC_ACT({ STEP(0); MC_GOTO(in_plain); })		\
-  MC_LABEL(done_plain)	MC_ACT({ STEP(5); GOELSE(elsie); })		\
+			MC_ACT(STEP(0); MC_GOTO(in_plain))		\
+  MC_LABEL(done_plain)	MC_ACT(STEP(5); GOELSE(elsie))			\
   MC_LABEL(in_plain)	WRAP(outer_wrap, { STEP(1); },			\
 					 { STEP(7); },			\
 					 { MISSTEP; })			\