2
0
Эх сурвалжийг харах

explicit block with FOREACH

Francois Perrad 10 жил өмнө
parent
commit
d0c043e605
22 өөрчлөгдсөн 441 нэмэгдсэн , 145 устгасан
  1. 27 13
      tests/test25.c
  2. 3 1
      tests/test26.c
  3. 27 13
      tests/test27.c
  4. 33 16
      tests/test28.c
  5. 6 2
      tests/test29.c
  6. 3 1
      tests/test30.c
  7. 3 1
      tests/test31.c
  8. 3 1
      tests/test32.c
  9. 3 1
      tests/test33.c
  10. 3 1
      tests/test34.c
  11. 9 3
      tests/test41.c
  12. 15 7
      tests/test42.c
  13. 3 1
      tests/test56.c
  14. 24 7
      tests/test63.c
  15. 24 7
      tests/test64.c
  16. 36 9
      tests/test68.c
  17. 40 10
      tests/test69.c
  18. 36 9
      tests/test70.c
  19. 40 10
      tests/test71.c
  20. 36 9
      tests/test72.c
  21. 40 10
      tests/test73.c
  22. 27 13
      tests/test78.c

+ 27 - 13
tests/test25.c

@@ -18,8 +18,9 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(head,&els[0]);
     CDL_PREPEND(head,&els[1]);
     CDL_PREPEND(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     CDL_COUNT(head,e, count);
     printf("count = %d\n", count);
@@ -27,8 +28,9 @@ int main(int argc, char *argv[]) {
     /* point head to head->next */
     printf("advancing head pointer\n");
     head = head->next;
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* follow circular loop a few times */
@@ -43,17 +45,21 @@ int main(int argc, char *argv[]) {
 
     printf("deleting b\n");
     CDL_DELETE(head,&els[1]);
-    CDL_FOREACH(head,e) printf("%c ", e->id);
+    CDL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (a)\n");
     CDL_DELETE(head,&els[0]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (c)\n");
     CDL_DELETE(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test DL macros */
@@ -61,28 +67,32 @@ int main(int argc, char *argv[]) {
     DL_APPEND(head,&els[0]);
     DL_APPEND(head,&els[1]);
     DL_APPEND(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     DL_COUNT(head,e, count);
     printf("count = %d\n", count);
 
     printf("deleting tail c\n");
     DL_DELETE(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head a\n");
     DL_DELETE(head,&els[0]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head b\n");
     DL_DELETE(head,&els[1]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test LL macros */
@@ -90,8 +100,9 @@ int main(int argc, char *argv[]) {
     LL_APPEND(head,&els[0]);
     LL_APPEND(head,&els[1]);
     LL_APPEND(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     LL_COUNT(head,e,count);
@@ -99,20 +110,23 @@ int main(int argc, char *argv[]) {
 
     printf("deleting tail c\n");
     LL_DELETE(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head a\n");
     LL_DELETE(head,&els[0]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head b\n");
     LL_DELETE(head,&els[1]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     return 0;

+ 3 - 1
tests/test26.c

@@ -36,7 +36,9 @@ int main(int argc, char *argv[]) {
         DL_APPEND(head, name);
     }
     DL_SORT(head, namecmp);
-    DL_FOREACH(head,elt) printf("%s", elt->bname);
+    DL_FOREACH(head,elt) {
+        printf("%s", elt->bname);
+    }
 
     memcpy(etmp.bname, "WES\n", 5UL);
     DL_SEARCH(head,elt,&etmp,namecmp);

+ 27 - 13
tests/test27.c

@@ -17,15 +17,17 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(head,&els[0]);
     CDL_PREPEND(head,&els[1]);
     CDL_PREPEND(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* point head to head->next */
     printf("advancing head pointer\n");
     head = head->next;
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* follow circular loop a few times */
@@ -40,17 +42,21 @@ int main(int argc, char *argv[]) {
 
     printf("deleting b\n");
     CDL_DELETE(head,&els[1]);
-    CDL_FOREACH(head,e) printf("%c ", e->id);
+    CDL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting head (a)\n");
     CDL_DELETE(head,&els[0]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting new head (c)\n");
     CDL_DELETE(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test DL macros */
@@ -58,26 +64,30 @@ int main(int argc, char *argv[]) {
     DL_PREPEND(head,&els[0]);
     DL_PREPEND(head,&els[1]);
     DL_PREPEND(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting c\n");
     DL_DELETE(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting a\n");
     DL_DELETE(head,&els[0]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting b\n");
     DL_DELETE(head,&els[1]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test LL macros */
@@ -85,26 +95,30 @@ int main(int argc, char *argv[]) {
     LL_PREPEND(head,&els[0]);
     LL_PREPEND(head,&els[1]);
     LL_PREPEND(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting c\n");
     LL_DELETE(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting a\n");
     LL_DELETE(head,&els[0]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting b\n");
     LL_DELETE(head,&els[1]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     return 0;

+ 33 - 16
tests/test28.c

@@ -18,15 +18,17 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(head,&els[1]);
     CDL_PREPEND(head,&els[2]);
     CDL_PREPEND(head,&els[3]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* point head to head->next */
     printf("advancing head pointer\n");
     head = head->next;
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* follow circular loop a few times */
@@ -41,22 +43,27 @@ int main(int argc, char *argv[]) {
 
     printf("deleting b\n");
     CDL_DELETE(head,&els[1]);
-    CDL_FOREACH(head,e) printf("%c ", e->id);
+    CDL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (a)\n");
     CDL_DELETE(head,&els[0]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (c)\n");
     CDL_DELETE(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (d)\n");
     CDL_DELETE(head,&els[3]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test DL macros */
@@ -65,32 +72,37 @@ int main(int argc, char *argv[]) {
     DL_PREPEND(head,&els[1]);
     DL_PREPEND(head,&els[2]);
     DL_APPEND(head,&els[3]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting c\n");
     DL_DELETE(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting a\n");
     DL_DELETE(head,&els[0]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting b\n");
     DL_DELETE(head,&els[1]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting d\n");
     DL_DELETE(head,&els[3]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test LL macros */
@@ -99,32 +111,37 @@ int main(int argc, char *argv[]) {
     LL_PREPEND(head,&els[1]);
     LL_PREPEND(head,&els[2]);
     LL_APPEND(head,&els[3]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting c\n");
     LL_DELETE(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting a\n");
     LL_DELETE(head,&els[0]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting b\n");
     LL_DELETE(head,&els[1]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting d\n");
     LL_DELETE(head,&els[3]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     return 0;

+ 6 - 2
tests/test29.c

@@ -36,12 +36,16 @@ int main(int argc, char *argv[]) {
         DL_APPEND(head, name);
     }
     DL_SORT(head, namecmp);
-    DL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    DL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     /* now delete the list head */
     printf("deleting head %shead->prev: %s", head->bname, head->prev->bname);
     DL_DELETE(head,head);
-    DL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    DL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 3 - 1
tests/test30.c

@@ -36,7 +36,9 @@ int main(int argc, char *argv[]) {
         CDL_PREPEND(head, name);
     }
     CDL_SORT(head, namecmp);
-    CDL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    CDL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 3 - 1
tests/test31.c

@@ -36,7 +36,9 @@ int main(int argc, char *argv[]) {
         CDL_PREPEND(head, name);
     }
     CDL_SORT(head, namecmp);
-    CDL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    CDL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 3 - 1
tests/test32.c

@@ -34,7 +34,9 @@ int main(int argc, char *argv[]) {
         DL_PREPEND(head, name);
     }
     /* DL_SORT(head, namecmp); */
-    DL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    DL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 3 - 1
tests/test33.c

@@ -36,7 +36,9 @@ int main(int argc, char *argv[]) {
         LL_PREPEND(head, name);
     }
     LL_SORT(head, namecmp);
-    LL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    LL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 3 - 1
tests/test34.c

@@ -34,7 +34,9 @@ int main(int argc, char *argv[]) {
         CDL_PREPEND(head, name);
     }
     /* CDL_SORT(head, namecmp); */
-    CDL_FOREACH(head,tmp) printf("%s", tmp->bname);
+    CDL_FOREACH(head,tmp) {
+        printf("%s", tmp->bname);
+    }
 
     fclose(file);
 

+ 9 - 3
tests/test41.c

@@ -17,7 +17,9 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(head,&els[0]);
     CDL_PREPEND(head,&els[1]);
     CDL_PREPEND(head,&els[2]);
-    CDL_FOREACH(head,e) printf("%c ", e->id);
+    CDL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
 
     /* point head to head->next */
     CDL_FOREACH_SAFE(head,e,tmp,tmp2) {
@@ -32,7 +34,9 @@ int main(int argc, char *argv[]) {
     DL_APPEND(head,&els[0]);
     DL_APPEND(head,&els[1]);
     DL_APPEND(head,&els[2]);
-    DL_FOREACH(head,e) printf("%c ", e->id);
+    DL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
     DL_FOREACH_SAFE(head,e,tmp) {
         printf("deleting %c ", e->id);
         DL_DELETE(head,e);
@@ -45,7 +49,9 @@ int main(int argc, char *argv[]) {
     LL_APPEND(head,&els[0]);
     LL_APPEND(head,&els[1]);
     LL_APPEND(head,&els[2]);
-    LL_FOREACH(head,e) printf("%c ", e->id);
+    LL_FOREACH(head,e) {
+        printf("%c ", e->id);
+    }
     LL_FOREACH_SAFE(head,e,tmp) {
         printf("deleting %c ", e->id);
         LL_DELETE(head,e);

+ 15 - 7
tests/test42.c

@@ -19,14 +19,17 @@ int main(int argc, char *argv[]) {
     LL_APPEND(head,&els[0]);
     LL_APPEND(head,&els[1]);
     LL_APPEND(head,&els[2]);
-    LL_FOREACH(head,e)
+    LL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     LL_SEARCH_SCALAR(head, e, id, 'b');
     if (e != NULL) printf("search scalar found b\n");
     LL_SEARCH(head, e, &els[0], eltcmp);
     if (e != NULL) printf("search found %c\n",e->id);
-    LL_FOREACH_SAFE(head,e,tmp) LL_DELETE(head,e);
+    LL_FOREACH_SAFE(head,e,tmp) {
+        LL_DELETE(head,e);
+    }
 
     printf("\n");
 
@@ -35,14 +38,17 @@ int main(int argc, char *argv[]) {
     DL_APPEND(head,&els[0]);
     DL_APPEND(head,&els[1]);
     DL_APPEND(head,&els[2]);
-    DL_FOREACH(head,e)
+    DL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     DL_SEARCH_SCALAR(head, e, id, 'b');
     if (e != NULL) printf("search scalar found b\n");
     DL_SEARCH(head, e, &els[0], eltcmp);
     if (e != NULL) printf("search found %c\n",e->id);
-    DL_FOREACH_SAFE(head,e,tmp) DL_DELETE(head,e);
+    DL_FOREACH_SAFE(head,e,tmp) {
+        DL_DELETE(head,e);
+    }
     printf("\n");
 
     /* test CDL macros */
@@ -50,15 +56,17 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(head,&els[0]);
     CDL_PREPEND(head,&els[1]);
     CDL_PREPEND(head,&els[2]);
-    CDL_FOREACH(head,e)
+    CDL_FOREACH(head,e) {
         printf("%c ", e->id);
+    }
     printf("\n");
     CDL_SEARCH_SCALAR(head, e, id, 'b');
     if (e != NULL) printf("search scalar found b\n");
     CDL_SEARCH(head, e, &els[0], eltcmp);
     if (e != NULL) printf("search found %c\n",e->id);
-    CDL_FOREACH_SAFE(head,e,tmp,tmp2) CDL_DELETE(head,e);
-
+    CDL_FOREACH_SAFE(head,e,tmp,tmp2) {
+        CDL_DELETE(head,e);
+    }
 
     return 0;
 }

+ 3 - 1
tests/test56.c

@@ -49,7 +49,9 @@ int main(int argc, char *argv[]) {
         DL_APPEND(head, name);
     }
     DL_SORT(head, namecmp);
-    DL_FOREACH(head,elt) printf("%s", elt->bname);
+    DL_FOREACH(head,elt) {
+        printf("%s", elt->bname);
+    }
 
     memcpy(etmp.bname, "WES\n", 5UL);
     DL_SEARCH(head,elt,&etmp,namecmp);

+ 24 - 7
tests/test63.c

@@ -18,30 +18,47 @@ int main(int argc, char *argv[]) {
     LL_APPEND(headA,&els[0]);
     LL_APPEND(headA,&els[1]);
     LL_APPEND(headA,&els[2]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     LL_APPEND(headB,&els[3]);
     LL_APPEND(headB,&els[4]);
     LL_APPEND(headB,&els[5]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     LL_CONCAT(headA,headB);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* other variations */
     headA = NULL;
     LL_CONCAT(headA,headB);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     headB = NULL;
     LL_CONCAT(headA,headB);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
-
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     headA=NULL;
     headB=NULL;
     LL_APPEND(headA,&els[0]);
     LL_APPEND(headB,&els[1]);
     LL_CONCAT(headA,headB);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 24 - 7
tests/test64.c

@@ -18,30 +18,47 @@ int main(int argc, char *argv[]) {
     DL_APPEND(headA,&els[0]);
     DL_APPEND(headA,&els[1]);
     DL_APPEND(headA,&els[2]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     DL_APPEND(headB,&els[3]);
     DL_APPEND(headB,&els[4]);
     DL_APPEND(headB,&els[5]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     DL_CONCAT(headA,headB);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* other variations */
     headA = NULL;
     DL_CONCAT(headA,headB);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     headB = NULL;
     DL_CONCAT(headA,headB);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
-
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     headA=NULL;
     headB=NULL;
     DL_APPEND(headA,&els[0]);
     DL_APPEND(headB,&els[1]);
     DL_CONCAT(headA,headB);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 36 - 9
tests/test68.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     DL_APPEND(headA,&els[1]);
     DL_APPEND(headA,&els[2]);
     DL_APPEND(headA,&els[3]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace head elem */
     DL_REPLACE_ELEM(headA, &els[0], &els[4]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_REPLACE_ELEM(headA, &els[4], &els[5]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace last elem */
     DL_REPLACE_ELEM(headA, &els[3], &els[6]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_REPLACE_ELEM(headA, &els[6], &els[7]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace middle elem */
     DL_REPLACE_ELEM(headA, &els[1], &els[8]);
     DL_REPLACE_ELEM(headA, &els[2], &els[9]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace all just to be sure the list is intact... */
     i = 10;
@@ -45,13 +63,22 @@ int main(int argc, char *argv[]) {
         DL_REPLACE_ELEM(headA, e, &els[i]);
         i++;
     }
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     DL_APPEND(headB, &els[18]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_REPLACE_ELEM(headB, &els[18], &els[19]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 40 - 10
tests/test69.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     DL_APPEND(headA,&els[1]);
     DL_APPEND(headA,&els[2]);
     DL_APPEND(headA,&els[3]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend head elem */
     DL_PREPEND_ELEM(headA, &els[0], &els[4]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_PREPEND_ELEM(headA, &els[4], &els[5]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend last elem */
     DL_PREPEND_ELEM(headA, &els[3], &els[6]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_PREPEND_ELEM(headA, &els[6], &els[7]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend middle elem */
     DL_PREPEND_ELEM(headA, &els[2], &els[8]);
     DL_PREPEND_ELEM(headA, &els[2], &els[9]);
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend all just to be sure the list is intact... */
     i = 10;
@@ -45,15 +63,27 @@ int main(int argc, char *argv[]) {
         DL_PREPEND_ELEM(headA, e, &els[i]);
         i++;
     }
-    DL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     DL_APPEND(headB, &els[20]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_PREPEND_ELEM(headB, &els[20], &els[21]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     DL_PREPEND_ELEM(headB, &els[21], &els[22]);
-    DL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    DL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 36 - 9
tests/test70.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     LL_APPEND(headA,&els[1]);
     LL_APPEND(headA,&els[2]);
     LL_APPEND(headA,&els[3]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace head elem */
     LL_REPLACE_ELEM(headA, &els[0], &els[4]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_REPLACE_ELEM(headA, &els[4], &els[5]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace last elem */
     LL_REPLACE_ELEM(headA, &els[3], &els[6]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_REPLACE_ELEM(headA, &els[6], &els[7]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace middle elem */
     LL_REPLACE_ELEM(headA, &els[1], &els[8]);
     LL_REPLACE_ELEM(headA, &els[2], &els[9]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace all just to be sure the list is intact... */
     i = 10;
@@ -45,13 +63,22 @@ int main(int argc, char *argv[]) {
         LL_REPLACE_ELEM(headA, e, &els[i]);
         i++;
     }
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     LL_APPEND(headB, &els[18]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_REPLACE_ELEM(headB, &els[18], &els[19]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 40 - 10
tests/test71.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     LL_APPEND(headA,&els[1]);
     LL_APPEND(headA,&els[2]);
     LL_APPEND(headA,&els[3]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend head elem */
     LL_PREPEND_ELEM(headA, &els[0], &els[4]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_PREPEND_ELEM(headA, &els[4], &els[5]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend last elem */
     LL_PREPEND_ELEM(headA, &els[3], &els[6]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_PREPEND_ELEM(headA, &els[6], &els[7]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend middle elem */
     LL_PREPEND_ELEM(headA, &els[2], &els[8]);
     LL_PREPEND_ELEM(headA, &els[2], &els[9]);
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend all just to be sure the list is intact... */
     i = 10;
@@ -45,15 +63,27 @@ int main(int argc, char *argv[]) {
         LL_PREPEND_ELEM(headA, e, &els[i]);
         i++;
     }
-    LL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     LL_APPEND(headB, &els[20]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_PREPEND_ELEM(headB, &els[20], &els[21]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     LL_PREPEND_ELEM(headB, &els[21], &els[22]);
-    LL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    LL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 36 - 9
tests/test72.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(headA,&els[2]);
     CDL_PREPEND(headA,&els[1]);
     CDL_PREPEND(headA,&els[0]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace head elem */
     CDL_REPLACE_ELEM(headA, &els[0], &els[4]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_REPLACE_ELEM(headA, &els[4], &els[5]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace last elem */
     CDL_REPLACE_ELEM(headA, &els[3], &els[6]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_REPLACE_ELEM(headA, &els[6], &els[7]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace middle elem */
     CDL_REPLACE_ELEM(headA, &els[1], &els[8]);
     CDL_REPLACE_ELEM(headA, &els[2], &els[9]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* replace all just to be sure the list is intact... */
     i = 10;
@@ -45,13 +63,22 @@ int main(int argc, char *argv[]) {
         CDL_REPLACE_ELEM(headA, e, &els[i]);
         i++;
     }
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     CDL_PREPEND(headB, &els[18]);
-    CDL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_REPLACE_ELEM(headB, &els[18], &els[19]);
-    CDL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 40 - 10
tests/test73.c

@@ -20,24 +20,42 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND(headA,&els[2]);
     CDL_PREPEND(headA,&els[1]);
     CDL_PREPEND(headA,&els[0]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend head elem */
     CDL_PREPEND_ELEM(headA, &els[0], &els[4]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_PREPEND_ELEM(headA, &els[4], &els[5]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend last elem */
     CDL_PREPEND_ELEM(headA, &els[3], &els[6]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_PREPEND_ELEM(headA, &els[6], &els[7]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend middle elem */
     CDL_PREPEND_ELEM(headA, &els[2], &els[8]);
     CDL_PREPEND_ELEM(headA, &els[2], &els[9]);
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* prepend all just to be sure the list is intact... */
     i = 10;
@@ -45,15 +63,27 @@ int main(int argc, char *argv[]) {
         CDL_PREPEND_ELEM(headA, e, &els[i]);
         i++;
     }
-    CDL_FOREACH(headA,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headA,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     /* single elem */
     CDL_PREPEND(headB, &els[20]);
-    CDL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_PREPEND_ELEM(headB, &els[20], &els[21]);
-    CDL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
     CDL_PREPEND_ELEM(headB, &els[21], &els[22]);
-    CDL_FOREACH(headB,e) printf("%c ", e->id); printf("\n");
+    CDL_FOREACH(headB,e) {
+        printf("%c ", e->id);
+    }
+    printf("\n");
 
     return 0;
 }

+ 27 - 13
tests/test78.c

@@ -17,15 +17,17 @@ int main(int argc, char *argv[]) {
     CDL_PREPEND2(head,&els[0],Prev,Next);
     CDL_PREPEND2(head,&els[1],Prev,Next);
     CDL_PREPEND2(head,&els[2],Prev,Next);
-    CDL_FOREACH2(head,e,Next)
+    CDL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* point head to head->next */
     printf("advancing head pointer\n");
     head = head->Next;
-    CDL_FOREACH2(head,e,Next)
+    CDL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* follow circular loop a few times */
@@ -40,17 +42,21 @@ int main(int argc, char *argv[]) {
 
     printf("deleting b\n");
     CDL_DELETE2(head,&els[1],Prev,Next);
-    CDL_FOREACH2(head,e,Next) printf("%c ", e->id);
+    CDL_FOREACH2(head,e,Next) {
+        printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (a)\n");
     CDL_DELETE2(head,&els[0],Prev,Next);
-    CDL_FOREACH2(head,e,Next)
+    CDL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
     printf("deleting (c)\n");
     CDL_DELETE2(head,&els[2],Prev,Next);
-    CDL_FOREACH2(head,e,Next)
+    CDL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test DL macros */
@@ -58,26 +64,30 @@ int main(int argc, char *argv[]) {
     DL_APPEND2(head,&els[0],Prev,Next);
     DL_APPEND2(head,&els[1],Prev,Next);
     DL_APPEND2(head,&els[2],Prev,Next);
-    DL_FOREACH2(head,e,Next)
+    DL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting tail c\n");
     DL_DELETE2(head,&els[2],Prev,Next);
-    DL_FOREACH2(head,e,Next)
+    DL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head a\n");
     DL_DELETE2(head,&els[0],Prev,Next);
-    DL_FOREACH2(head,e,Next)
+    DL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head b\n");
     DL_DELETE2(head,&els[1],Prev,Next);
-    DL_FOREACH2(head,e,Next)
+    DL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     /* test LL macros */
@@ -85,26 +95,30 @@ int main(int argc, char *argv[]) {
     LL_APPEND2(head,&els[0],Next);
     LL_APPEND2(head,&els[1],Next);
     LL_APPEND2(head,&els[2],Next);
-    LL_FOREACH2(head,e,Next)
+    LL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting tail c\n");
     LL_DELETE2(head,&els[2],Next);
-    LL_FOREACH2(head,e,Next)
+    LL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head a\n");
     LL_DELETE2(head,&els[0],Next);
-    LL_FOREACH2(head,e,Next)
+    LL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     printf("deleting head b\n");
     LL_DELETE2(head,&els[1],Next);
-    LL_FOREACH2(head,e,Next)
+    LL_FOREACH2(head,e,Next) {
         printf("%c ", e->id);
+    }
     printf("\n");
 
     return 0;