Changes in / [c699602:2e0bb92]

Files:

• libcfa/src/concurrency/future.hfa (modified) (3 diffs)
• tests/.expect/attributes.arm64.txt (modified) (10 diffs)
• tests/.expect/attributes.x64.txt (modified) (10 diffs)
• tests/.expect/attributes.x86.txt (modified) (10 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/attributes.cfa (modified) (8 diffs)
• tests/collections/queue.cfa (modified) (6 diffs)
• tests/collections/sequence.cfa (modified) (6 diffs)
• tests/collections/stack.cfa (modified) (7 diffs)
• tests/collections/vector-demo.cfa (modified) (2 diffs)
• tests/configs/usage.cfa (modified) (1 diff)
• tests/ctrl-flow/.expect/superfluous.txt (deleted)
• tests/ctrl-flow/labelledExit.cfa (modified) (4 diffs)
• tests/ctrl-flow/loop_else.cfa (modified) (1 diff)
• tests/ctrl-flow/superfluous.cfa (deleted)

libcfa/src/concurrency/future.hfa

@@ -260 +260 @@
                         if( this.has_first != false) abort("Attempting to reset a multi_future with at least one blocked threads");
                         if( !is_empty(this.blocked) ) abort("Attempting to reset a multi_future with multiple blocked threads");
-                        reset( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) );
+                        reset( (future_t&)*(&this+sizeof(monitor$)) );
                 }
 
@@ -266 +266 @@
                 bool fulfil( multi_future(T) & this, T result ) {
                         this.result = result;
-                        return fulfil( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) ) != 0p;
+                        return fulfil( (future_t&)*(&this+sizeof(monitor$)) ) != 0p;
                 }
 
@@ -275 +275 @@
                         bool w = !sw;
                         if ( sw ) {
-                                w = wait( (future_t&)*(future_t*)((uintptr_t)&this + sizeof(monitor$)) );
+                                w = wait( (future_t&)*(&this+sizeof(monitor$)) );
                                 $first_done( this );
                         }

tests/.expect/attributes.arm64.txt

@@ -1 @@
-
-#pragma GCC diagnostic ignored "-Wattributes"
-;
 signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
@@ -8 +5 @@
     }
 
-    {
-        ((void)(_X10_retval_lai_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_lai_1;
 }
 struct __attribute__ ((unused)) __anonymous0 {
@@ -1167 +1159 @@
 __attribute__ ((unused)) signed int _X2f1Fi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_f1i_1;
-    {
-        ((void)(_X10_retval_f1i_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_f1i_1;
 }
 __attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void);
 __attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){
     __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1;
-    {
-        ((void)((*((signed int ***)(&_X10_retval_f2KPPi_1)))=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f2KPPi_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f3FPA0i_i__1(signed int __anonymous_object0))[];
@@ -1186 +1168 @@
 __attribute__ ((unused,unused)) signed int (*_X2f5FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f5PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f5PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f5PA0i_1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f6FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f6PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f6PA0i_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0);
 __attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f8Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f8Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f9Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f9Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X11_retval_f10Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X11_retval_f10Fi_i__1;
-}
-void _X3vtrFv___1(void){
+}
+signed int _X3vtrFi___1(void){
+    __attribute__ ((unused)) signed int _X11_retval_vtri_1;
     __attribute__ ((unused,unused,used)) signed int _X2t1i_2;
     __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t2PPi_2;
@@ -1242 +1192 @@
     __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void);
 }
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
-}
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd1i_1;
+}
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd2i_1;
+}
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd3i_1;
+}
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+    __attribute__ ((unused)) signed int _X12_retval_ipd4i_1;
 }
 signed int _X4tpr1Fi_i__1(__attribute__ ((unused,unused,unused)) signed int _X3Fooi_1);
@@ -1261 +1215 @@
 signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void));
 signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0)));
-void _X2adFv___1(void){
+signed int _X2adFi___1(void){
+    __attribute__ ((unused)) signed int _X10_retval_adi_1;
     __attribute__ ((used,unused)) signed int _X3ad1i_2;
     __attribute__ ((unused,unused,unused)) signed int *_X3ad2Pi_2;
@@ -1364 +1319 @@
 signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0));
 struct Vad {
-    __attribute__ ((unused)) signed int _X1xi_1;
     __attribute__ ((unused)) signed int :4;
     __attribute__ ((unused)) signed int :4;
@@ -1370 +1324 @@
 };
 static inline void _X12_constructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X12_constructorFv_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X11_destructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ^?{} */);
-    }
-
 }
 static inline struct Vad _X16_operator_assignFS3Vad_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
     __attribute__ ((unused)) struct Vad _X4_retS3Vad_1;
     {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1));
-    }
-
-    {
         ((void)_X12_constructorFv_S3VadS3Vad_autogen___1((&_X4_retS3Vad_1), (*_X4_dstS3Vad_1)));
     }
 
     return _X4_retS3Vad_1;
-}
-static inline void _X12_constructorFv_S3Vadi_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) signed int _X1xi_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X1xi_1) /* ?{} */);
-    }
-
 }
 __attribute__ (( noreturn )) void _X4fredFv___1(void){
@@ -1424 +1356 @@
     }
 
-    {
-        ((void)abort());
-    }
-
 }
 __attribute__ ((noreturn)) void _X4maryFv___1(void){
-    struct __attribute__ ((aligned(16))) S {
+    struct __attribute__ ((aligned(64))) S {
         signed int _X1ii_2;
     };
@@ -1487 +1415 @@
     }
 
-    {
-        ((void)abort());
-    }
-
-}
+}

tests/.expect/attributes.x64.txt

@@ -1 @@
-
-#pragma GCC diagnostic ignored "-Wattributes"
-;
 signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
@@ -8 +5 @@
     }
 
-    {
-        ((void)(_X10_retval_lai_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_lai_1;
 }
 struct __attribute__ ((unused)) __anonymous0 {
@@ -1167 +1159 @@
 __attribute__ ((unused)) signed int _X2f1Fi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_f1i_1;
-    {
-        ((void)(_X10_retval_f1i_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_f1i_1;
 }
 __attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void);
 __attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){
     __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1;
-    {
-        ((void)((*((signed int ***)(&_X10_retval_f2KPPi_1)))=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f2KPPi_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f3FPA0i_i__1(signed int __anonymous_object0))[];
@@ -1186 +1168 @@
 __attribute__ ((unused,unused)) signed int (*_X2f5FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f5PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f5PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f5PA0i_1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f6FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f6PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f6PA0i_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0);
 __attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f8Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f8Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f9Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f9Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X11_retval_f10Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X11_retval_f10Fi_i__1;
-}
-void _X3vtrFv___1(void){
+}
+signed int _X3vtrFi___1(void){
+    __attribute__ ((unused)) signed int _X11_retval_vtri_1;
     __attribute__ ((unused,unused,used)) signed int _X2t1i_2;
     __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t2PPi_2;
@@ -1242 +1192 @@
     __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void);
 }
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
-}
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd1i_1;
+}
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd2i_1;
+}
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd3i_1;
+}
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+    __attribute__ ((unused)) signed int _X12_retval_ipd4i_1;
 }
 signed int _X4tpr1Fi_i__1(__attribute__ ((unused,unused,unused)) signed int _X3Fooi_1);
@@ -1261 +1215 @@
 signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void));
 signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0)));
-void _X2adFv___1(void){
+signed int _X2adFi___1(void){
+    __attribute__ ((unused)) signed int _X10_retval_adi_1;
     __attribute__ ((used,unused)) signed int _X3ad1i_2;
     __attribute__ ((unused,unused,unused)) signed int *_X3ad2Pi_2;
@@ -1364 +1319 @@
 signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0));
 struct Vad {
-    __attribute__ ((unused)) signed int _X1xi_1;
     __attribute__ ((unused)) signed int :4;
     __attribute__ ((unused)) signed int :4;
@@ -1370 +1324 @@
 };
 static inline void _X12_constructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X12_constructorFv_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X11_destructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ^?{} */);
-    }
-
 }
 static inline struct Vad _X16_operator_assignFS3Vad_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
     __attribute__ ((unused)) struct Vad _X4_retS3Vad_1;
     {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1));
-    }
-
-    {
         ((void)_X12_constructorFv_S3VadS3Vad_autogen___1((&_X4_retS3Vad_1), (*_X4_dstS3Vad_1)));
     }
 
     return _X4_retS3Vad_1;
-}
-static inline void _X12_constructorFv_S3Vadi_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) signed int _X1xi_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X1xi_1) /* ?{} */);
-    }
-
 }
 __attribute__ (( noreturn )) void _X4fredFv___1(void){
@@ -1424 +1356 @@
     }
 
-    {
-        ((void)abort());
-    }
-
 }
 __attribute__ ((noreturn)) void _X4maryFv___1(void){
-    struct __attribute__ ((aligned(16))) S {
+    struct __attribute__ ((aligned(64))) S {
         signed int _X1ii_2;
     };
@@ -1487 +1415 @@
     }
 
-    {
-        ((void)abort());
-    }
-
-}
+}

tests/.expect/attributes.x86.txt

@@ -1 @@
-
-#pragma GCC diagnostic ignored "-Wattributes"
-;
 signed int _X2laFi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_lai_1;
@@ -8 +5 @@
     }
 
-    {
-        ((void)(_X10_retval_lai_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_lai_1;
 }
 struct __attribute__ ((unused)) __anonymous0 {
@@ -1167 +1159 @@
 __attribute__ ((unused)) signed int _X2f1Fi___1(void){
     __attribute__ ((unused)) signed int _X10_retval_f1i_1;
-    {
-        ((void)(_X10_retval_f1i_1=1) /* ?{} */);
-    }
-
-    return _X10_retval_f1i_1;
 }
 __attribute__ ((unused,unused,unused,used)) signed int **const _X2f2FPPi___1(void);
 __attribute__ ((unused,unused,unused)) signed int **const _X2f2FPPi___1(void){
     __attribute__ ((unused)) signed int **const _X10_retval_f2KPPi_1;
-    {
-        ((void)((*((signed int ***)(&_X10_retval_f2KPPi_1)))=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f2KPPi_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f3FPA0i_i__1(signed int __anonymous_object0))[];
@@ -1186 +1168 @@
 __attribute__ ((unused,unused)) signed int (*_X2f5FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f5PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f5PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f5PA0i_1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f6FPA0i_i__1(signed int _X1pi_1))[]{
     __attribute__ ((unused)) signed int (*_X10_retval_f6PA0i_1)[];
-    {
-        ((void)((void)_X1pi_1));
-    }
-
-    {
-        ((void)(_X10_retval_f6PA0i_1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f6PA0i_1;
 }
 __attribute__ ((unused,used,unused)) signed int (*_X2f7FFi_i____1(void))(signed int __param_0);
 __attribute__ ((unused,unused)) signed int (*_X2f8FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f8Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f8Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f8Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X2f9FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X10_retval_f9Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X10_retval_f9Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X10_retval_f9Fi_i__1;
 }
 __attribute__ ((unused,unused)) signed int (*_X3f10FFi_i____1(void))(signed int __param_0){
     __attribute__ ((unused)) signed int (*_X11_retval_f10Fi_i__1)(signed int __param_0);
-    {
-        ((void)(_X11_retval_f10Fi_i__1=((void*)((unsigned long int )0))) /* ?{} */);
-    }
-
-    return _X11_retval_f10Fi_i__1;
-}
-void _X3vtrFv___1(void){
+}
+signed int _X3vtrFi___1(void){
+    __attribute__ ((unused)) signed int _X11_retval_vtri_1;
     __attribute__ ((unused,unused,used)) signed int _X2t1i_2;
     __attribute__ ((unused,unused,unused,unused,unused)) signed int **_X2t2PPi_2;
@@ -1242 +1192 @@
     __attribute__ ((unused,unused,unused,unused)) signed int *_X2t6FPi___2(void);
 }
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
-void _X4ipd1Fv_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
-}
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd2Fv_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
-void _X4ipd3Fv_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
-}
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
-void _X4ipd4Fv_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1);
+signed int _X4ipd1Fi_ii__1(__attribute__ ((unused,unused,unused)) signed int _X1pi_1, __attribute__ ((unused,unused,unused)) signed int _X1qi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd1i_1;
+}
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd2Fi_PiPi__1(__attribute__ ((unused,unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd2i_1;
+}
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1);
+signed int _X4ipd3Fi_PiPi__1(__attribute__ ((unused,unused,unused)) signed int *_X1pPi_1, __attribute__ ((unused,unused,unused)) signed int *_X1qPi_1){
+    __attribute__ ((unused)) signed int _X12_retval_ipd3i_1;
+}
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void));
+signed int _X4ipd4Fi_Fi__Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X1pFi___1)(void), __attribute__ ((unused,unused,unused)) signed int (*_X1qFi___1)(void)){
+    __attribute__ ((unused)) signed int _X12_retval_ipd4i_1;
 }
 signed int _X4tpr1Fi_i__1(__attribute__ ((unused,unused,unused)) signed int _X3Fooi_1);
@@ -1261 +1215 @@
 signed int _X4tpr6Fi_Fi____1(__attribute__ ((unused,unused,unused)) signed int (*_X3FooFi___1)(void));
 signed int _X4tpr7Fi_Fi_Fi_i____1(__attribute__ ((unused,unused)) signed int (*__anonymous_object3)(signed int (*__param_0)(signed int __param_0)));
-void _X2adFv___1(void){
+signed int _X2adFi___1(void){
+    __attribute__ ((unused)) signed int _X10_retval_adi_1;
     __attribute__ ((used,unused)) signed int _X3ad1i_2;
     __attribute__ ((unused,unused,unused)) signed int *_X3ad2Pi_2;
@@ -1364 +1319 @@
 signed int _X4apd7Fi_Fi_i_Fi_i___1(__attribute__ ((unused,unused,unused)) signed int (*__anonymous_object16)(__attribute__ ((unused)) signed int __param_0), __attribute__ ((unused,unused,unused)) signed int (*__anonymous_object17)(__attribute__ ((unused)) signed int __param_0));
 struct Vad {
-    __attribute__ ((unused)) signed int _X1xi_1;
     __attribute__ ((unused)) signed int :4;
     __attribute__ ((unused)) signed int :4;
@@ -1370 +1324 @@
 };
 static inline void _X12_constructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X12_constructorFv_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1) /* ?{} */);
-    }
-
 }
 static inline void _X11_destructorFv_S3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1) /* ^?{} */);
-    }
-
 }
 static inline struct Vad _X16_operator_assignFS3Vad_S3VadS3Vad_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) struct Vad _X4_srcS3Vad_1){
     __attribute__ ((unused)) struct Vad _X4_retS3Vad_1;
     {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X4_srcS3Vad_1._X1xi_1));
-    }
-
-    {
         ((void)_X12_constructorFv_S3VadS3Vad_autogen___1((&_X4_retS3Vad_1), (*_X4_dstS3Vad_1)));
     }
 
     return _X4_retS3Vad_1;
-}
-static inline void _X12_constructorFv_S3Vadi_autogen___1(__attribute__ ((unused)) struct Vad *_X4_dstS3Vad_1, __attribute__ ((unused)) signed int _X1xi_1){
-    {
-        ((void)((*_X4_dstS3Vad_1)._X1xi_1=_X1xi_1) /* ?{} */);
-    }
-
 }
 __attribute__ (( noreturn )) void _X4fredFv___1(void){
@@ -1424 +1356 @@
     }
 
-    {
-        ((void)abort());
-    }
-
 }
 __attribute__ ((noreturn)) void _X4maryFv___1(void){
-    struct __attribute__ ((aligned(16))) S {
+    struct __attribute__ ((aligned(64))) S {
         signed int _X1ii_2;
     };
@@ -1487 +1415 @@
     }
 
-    {
-        ((void)abort());
-    }
-
-}
+}

tests/Makefile.am

@@ -61 +61 @@
 # Tests that need investigation from the CFA team about why they require lax wflags.  Goal is to eliminate this list.
 WFLGAS_OPT_LAX_TO_INVESTIGATE = \
+        attributes \
+        collections/queue \
+        collections/sequence \
+        collections/stack \
         collections/vector-demo \
         concurrency/actors/dynamic \
@@ -93 +97 @@
         concurrency/waituntil/repeat_close \
         concurrency/waituntil/timeout \
+        configs/usage \
+        ctrl-flow/labelledExit \
+        ctrl-flow/loop_else \
         designations \
         exceptions/cardgame \

tests/attributes.cfa

@@ -1 @@
-//
+// 
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// attributes.cfa --
-//
+// 
+// attributes.cfa -- 
+// 
 // Author           : Peter A. Buhr
 // Created On       : Mon Feb  6 16:07:02 2017
@@ -12 +12 @@
 // Last Modified On : Fri Dec 20 15:32:21 2024
 // Update Count     : 53
-//
+// 
 
-#pragma GCC diagnostic ignored "-Wattributes"
 
 // label attribute
 int la() {
   L: __attribute__(( unused )) 1;
-  return 1;
 }
 
@@ -66 +64 @@
 // function_declarator
 __attribute__(( unused )) int f1() __attribute__(( used ));
-__attribute__(( unused )) int f1() { return 1; }
+__attribute__(( unused )) int f1() {}
 __attribute__(( unused )) int * __attribute__(( unused )) * const __attribute__(( unused )) f2() __attribute__(( used ));
-__attribute__(( unused )) int * __attribute__(( unused )) * const __attribute__(( unused )) f2() { return 0p; }
+__attribute__(( unused )) int * __attribute__(( unused )) * const __attribute__(( unused )) f2() {}
 __attribute__(( unused )) int (* __attribute__(( unused )) f3(int))[] __attribute__(( used ));
 __attribute__(( unused )) int ( __attribute__(( unused )) * __attribute__(( unused )) f4(int))[] __attribute__(( used ));
-__attribute__(( unused )) int (* __attribute__(( unused )) f5(int p))[] { (void)p; return 0p; }
-__attribute__(( unused )) int ( __attribute__(( unused )) * (f6)(int p))[] { (void)p; return 0p; }
+__attribute__(( unused )) int (* __attribute__(( unused )) f5(int p))[] {}
+__attribute__(( unused )) int ( __attribute__(( unused )) * (f6)(int p))[] {}
 __attribute__(( unused )) int (* __attribute__(( unused )) f7())(int) __attribute__(( used ));
-__attribute__(( unused )) int (* __attribute__(( unused )) f8())(int) { return 0p; }
-__attribute__(( unused )) int ( __attribute__(( unused )) * f9())(int) { return 0p; }
-__attribute__(( unused )) int ( __attribute__(( unused )) * (f10)())(int) { return 0p; }
+__attribute__(( unused )) int (* __attribute__(( unused )) f8())(int) {}
+__attribute__(( unused )) int ( __attribute__(( unused )) * f9())(int) {}
+__attribute__(( unused )) int ( __attribute__(( unused )) * (f10)())(int) {}
 
 
 // variable_type_redeclarator
 typedef int t1, t2, t3, t4, t5, t6, t7, t8;
-void vtr() {
+int vtr() {
     // redefine typedef name in new scope
     __attribute__(( unused )) int __attribute__(( unused )) t1 __attribute__(( used ));
@@ -94 +92 @@
 
 // identifier_parameter_declarator
-void ipd1( __attribute__(( unused )) int __attribute__(( unused )) p __attribute__(( unused )),
+int ipd1( __attribute__(( unused )) int __attribute__(( unused )) p __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) q __attribute__(( unused )) );
-void ipd1( __attribute__(( unused )) int __attribute__(( unused )) p __attribute__(( unused )),
+int ipd1( __attribute__(( unused )) int __attribute__(( unused )) p __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) q __attribute__(( unused )) ) {}
-void ipd2( __attribute__(( unused )) int __attribute__(( unused )) * __attribute__(( unused )) p __attribute__(( unused )),
+int ipd2( __attribute__(( unused )) int __attribute__(( unused )) * __attribute__(( unused )) p __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) (* (q)) __attribute__(( unused )) );
-void ipd2( __attribute__(( unused )) int __attribute__(( unused )) * __attribute__(( unused )) p __attribute__(( unused )),
+int ipd2( __attribute__(( unused )) int __attribute__(( unused )) * __attribute__(( unused )) p __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) (* (q)) __attribute__(( unused )) ) {}
-void ipd3( __attribute__(( unused )) int __attribute__(( unused )) p[] __attribute__(( unused )),
+int ipd3( __attribute__(( unused )) int __attribute__(( unused )) p[] __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) ((q)[]) __attribute__(( unused )) );
-void ipd3( __attribute__(( unused )) int __attribute__(( unused )) p[] __attribute__(( unused )),
+int ipd3( __attribute__(( unused )) int __attribute__(( unused )) p[] __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) ((q)[]) __attribute__(( unused )) ) {}
-void ipd4( __attribute__(( unused )) int __attribute__(( unused )) p() __attribute__(( unused )),
+int ipd4( __attribute__(( unused )) int __attribute__(( unused )) p() __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) ((q)()) __attribute__(( unused )) );
-void ipd4( __attribute__(( unused )) int __attribute__(( unused )) p() __attribute__(( unused )),
+int ipd4( __attribute__(( unused )) int __attribute__(( unused )) p() __attribute__(( unused )),
           __attribute__(( unused )) int __attribute__(( unused )) ((q)()) __attribute__(( unused )) ) {}
 
@@ -124 +122 @@
 
 // abstract_declarator
-void ad() {
+int ad() {
     typeof( int __attribute__(( used )) ) ad1 __attribute__(( unused ));
     typeof( int __attribute__(( unused )) * __attribute__(( unused )) ) ad2 __attribute__(( unused ));
@@ -159 +157 @@
 // variable_abstract_declarator
 struct Vad {
-    int __attribute__(( unused )) x;
+    int __attribute__(( unused ));
     int __attribute__(( unused )) :4;
     int __attribute__(( unused )) :4, __attribute__(( unused )) :6;
@@ -176 +174 @@
                 3;
         }
-        abort();
 }
 
 @[ noreturn ] void mary() {
-        @[aligned(16)] struct S { int i; };
+        @[aligned(64)] struct S { int i; };
         int @[unused] i;
         switch ( 3 ) {
@@ -190 +187 @@
                 3;
         }
-        abort();
 }
 

tests/collections/queue.cfa

@@ -28 +28 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 add( fred, *new( 2 * i ) );
@@ -48 +48 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 add( fred, *new( 2 * i + 1 ) );
@@ -133 +133 @@
                 int j;
         };
-        __attribute__((unused))
         void ?{}( Mary & mary ) { abort(); }
         void ?{}( Mary & mary, int p ) with( mary ) {
@@ -151 +150 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 add( mary, *new( 2 * i ) );
@@ -162 +161 @@
         }
         sout | nl;
-
+        
         for ( i; 9 ) {
                 delete( &drop( mary ) );
@@ -171 +170 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 add( mary, *new( 2 * i + 1 ) );

tests/collections/sequence.cfa

@@ -31 +31 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 add( fred, *new( 2 * i ) );
@@ -51 +51 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 addTail( fred, *new( 2 * i + 1 ) );
@@ -156 +156 @@
                 int j;
         };
-        __attribute__((unused))
         void ?{}( Mary & mary ) { abort(); }
         void ?{}( Mary & mary, int p ) with( mary ) {
@@ -177 +176 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 add( mary, *new( 2 * i ) );
@@ -188 +187 @@
         }
         sout | nl;
-
+        
         for ( i; 9 ) {
                 delete( &dropHead( mary ) );
@@ -197 +196 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 addTail( mary, *new( 2 * i + 1 ) );

tests/collections/stack.cfa

@@ -28 +28 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 push( fred, *new( 2 * i ) );
@@ -39 +39 @@
 
         sout | head( fred ).i | nl;
-
+        
         for ( i; 9 ) {
                 delete( &pop( fred ) );
@@ -48 +48 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 push( fred, *new( 2 * i + 1 ) );
@@ -67 +67 @@
                 int j;
         };
-        __attribute__((unused))
         void ?{}( Mary & mary ) { abort(); }
         void ?{}( Mary & mary, int p ) with( mary ) {
@@ -86 +85 @@
         }
         sout | "empty" | nl;
-
+        
         for ( i; 10 ) {
                 push( mary, *new( 2 * i ) );
@@ -95 +94 @@
         }
         sout | nl;
-
+        
         for ( i; 9 ) {
                 delete( &pop( mary ) );
@@ -104 +103 @@
         }
         sout | nl;
-
+        
         for ( i; 10 ) {
                 push( mary, *new( 2 * i + 1 ) );

tests/collections/vector-demo.cfa

@@ -96 +96 @@
       #endif
 
-        // forbid calling a function that returns permit by value
-      #ifdef TRY_RETURN_PERMIT_BYVAL_1
         // can declare function that returns permit (wish to forbid)
         vector_permit(float) g( vector( float ) & theVec ) {
@@ -103 +101 @@
         }
 
+        // forbid calling a function that returns permit by value
+      #ifdef TRY_RETURN_PERMIT_BYVAL_1
         vector_permit(float) ofG = g( v ); // Unique best alternative includes deleted identifier
       #endif
-
+        
         // allow declaration of permit, populating from exit
         vector_exit(float) h( vector( float ) & theVec ) {

tests/configs/usage.cfa

@@ -108 +108 @@
 
 // no used
-static int true_main( const char *, const char * []) { return 0; }
-__attribute__((unused)) static void check_main(const char *);
+static int true_main( const char * path, const char * env[]) { return 0; }

tests/ctrl-flow/labelledExit.cfa

@@ -1 @@
-//
+// 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// labelledExit.cfa --
-//
+// 
+// labelledExit.cfa -- 
+// 
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 10 07:29:39 2016
@@ -12 +12 @@
 // Last Modified On : Fri Jan 17 14:18:15 2025
 // Update Count     : 14
-//
+// 
 
 int foo() {
-        int i = 0;
-        int x = 0, y = 0;
+        int i;
+        int x, y;
 
-        // block, labelled exits
+        x = 0; y = 0;
+
+        // block, labelled exits
 
   Block: {
-                if ( x == y ) {
-                        for ( ; i < y; ) {
-                                y += 1;
-                                if ( y < 10 ) break Block;
-                        }
-                }
-        }
+                if ( x == y ) {
+                        for ( ; i < y; ) {
+                                y += 1;
+                                if ( y < 10 ) break Block;
+                        }
+                }
+        }
 
-        // loops, labelled exits
+        // loops, labelled exits
 
-  w1: while ( y == 10 ) break w1;
+  w1: while ( y == 10 );
 
   w2: while ( x < 10 ) {
-                while (y < 5 ) {
-                        if ( y == 3 ) break w2;
-                }
-                x += 1;
-        }
+                while (y < 5 ) {
+                        if ( y == 3 ) break w2;
+                }
+                x += 1;
+        }
 
   A: for ( i = 0; i < 10; i += 1 ) {
-          B: for ( i = 0; i < 10; i += 1 ) {
-                  C: for ( i = 0; i < 10; i += 1 ) {
-                                goto A;
-                                goto B;
-                                goto C;
-                                continue A;
-                                continue B;
-                                continue C;
-                                continue;
-                                break A;
-                                break B;
-                                break C;
-                                break;
-                        }
-                }
-        }
+          B: for ( i = 0; i < 10; i += 1 ) {
+                  C: for ( i = 0; i < 10; i += 1 ) {
+                                goto A;
+                                goto B;
+                                goto C;
+                                continue A;
+                                continue B;
+                                continue C;
+                                continue;
+                                break A;
+                                break B;
+                                break C;
+                                break;
+                        }
+                }
+        }
 
   D: for () {
-                break D;
-                continue D;
-        }
+                break D;
+                continue D;
+        }
 
   Z : i += 1;
-        goto Z;
+        goto Z;
   X: Y: for () {
-                i += 1;
-                if ( i > 5 ) continue X;
-                if ( i < 5 ) break X;
-                if ( i < 5 ) break Y;
-                break;
-        }
+                i += 1;
+                if ( i > 5 ) continue X;
+                if ( i < 5 ) break X;
+                if ( i < 5 ) break Y;
+                break;
+        }
   XX: for () {
-          YY: for () {
-                  ZZ: for () {
-                                i += 1;
-                                if ( i > 5 ) continue XX;
-                                if ( i < 5 ) continue YY;
-                                if ( i < 5 ) continue ZZ;
-                                if ( i > 5 ) break XX;
-                                if ( i < 5 ) break YY;
-                                if ( i < 5 ) break ZZ;
-                                break;
-                        }
-                }
-        }
+          YY: for () {
+                  ZZ: for () {
+                                i += 1;
+                                if ( i > 5 ) continue XX;
+                                if ( i < 5 ) continue YY;
+                                if ( i < 5 ) continue ZZ;
+                                if ( i > 5 ) break XX;
+                                if ( i < 5 ) break YY;
+                                if ( i < 5 ) break ZZ;
+                                break;
+                        }
+                }
+        }
 
-        for () ;
-        for ( int i = 0 ;; ) ++i;
-        for (  ; i < 0; ) ;
-        for (  ; ; i += 1 ) ;
+        for () ;
+        for ( int i = 0 ;; ) ;
+        for (  ; i < 0; ) ;
+        for (  ; ; i += 1 ) ;
   L0:  L1:  L2:  L3:  L4:  L5:  L6:  L7:  L8:  L9:
   L10: L11: L12: L13: L14: L15: L16: L17: L18: L19:
   L20: L21: L22: L23: L24: L25: L26: L27: L28: L29:
   L31: L32: L33: L34:
-        for () {
-                break L0;
-                break L1;  break L2;  break L3;  break L4;  break L5;  break L6;
-                break L7;  break L8;  break L9;  break L10; break L11; break L12;
-                break L13; break L14; break L15; break L16; break L17; break L18;
-                break L19; break L20; break L21; break L22; break L23; break L24;
-                break L25; break L26; break L27; break L28; break L29; break L31;
-                break L32; break L33; break L34;
-        }
+        for () {
+                break L0;
+        }
 
-        // switch/choose, labelled exits
+        // switch/choose, labelled exits
 
   Switch: switch ( i ) {
-          default:
-                i += 1;
-                fallthrough;
-          case 0:
-                i += 1;
-                break Switch;
-          case 1:
-                switch ( i ) {
-                  case 0:
-                        break Switch;
-                  default:
-                        ; break;
-                }
-        }
+          default:
+                i += 1;
+          case 0:
+                i += 1;
+                break Switch;
+          case 1:
+                switch ( i ) {
+                  case 0:
+                        break Switch;
+                  default:
+                        ; break;
+                }
+        }
 
   Choose: choose ( i ) {
-          default:
-                i += 1;
-          case 0:
-                i += 1;
-                break Choose;
-          case 1:
-                choose ( i ) {
-                  case 0:
-                        break;
-                  default:
-                        break Choose;
-                }
-                fallthrough;
-          case 2:
-                i += 1;
-        }
+          default:
+                i += 1;
+          case 0:
+                i += 1;
+                break Choose;
+          case 1:
+                choose ( i ) {
+                  case 0:
+                        break;
+                  default:
+                        break Choose;
+                }
+                fallthrough;
+          case 2:
+                i += 1;
+        }
 
-        // all nested control options, labelled exits
+        // all nested control options, labelled exits
 
   Comp: {
@@ -153 +148 @@
                                                                 break Try;
                                                                 break Comp;
-                                                                break For;              continue For;
-                                                                break While;    continue While;
-                                                                break Do;               continue Do;
-                                                                break If;
-                                                                break Switch2;
+                                                                break For;              continue For;
+                                                                break While;    continue While;
+                                                                break Do;               continue Do;
+                                                                break If;
+                                                                break Switch2;
                                                         } // switch
                                                 } // if
@@ -183 +178 @@
 }
 
-int main() {
+int main( int argc, char const *argv[] ) {
         printf("done\n");
 }

tests/ctrl-flow/loop_else.cfa

@@ -23 +23 @@
 
         sout | nlOff;                                                                           // turn off auto newline
-        while ( true ) { sout | "empty"; break; } else { sout | "else"; }                               sout | nl;
-        do { sout | "empty"; break; } while ( true ) else { sout | "else"; }                    sout | nl;
-        for ( ; true ; ) { sout | "empty"; break; } else { sout | "else"; }                             sout | nl | nl;
+        while () { sout | "empty"; break; } else { sout | "else"; }                                             sout | nl;
+        do { sout | "empty"; break; } while () else { sout | "else"; }                                  sout | nl;
+        for () { sout | "empty"; break; } else { sout | "else"; }                                               sout | nl | nl;
 
         do { sout | "false"; } while (false) else { sout | "else"; }                                    sout | nl | nl;