Changes in tests/designations.cfa [2e0bb92:c565d68]

File:

• tests/designations.cfa (modified) (15 diffs)

tests/designations.cfa

@@ -10 +10 @@
 // Created On       : Thu Jun 29 15:26:36 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jan 28 21:49:50 2025
-// Update Count     : 82
-//
+// Last Modified On : Sun Oct 13 11:53:16 2024
+// Update Count     : 31
+//
+
+#include <fstream.hfa>
 
 // Note: this test case has been crafted so that it compiles with both cfa and with gcc without any modifications.
-#include <stdio.h>
 #ifdef __cforall
 #define AT @
@@ -22 +23 @@
 #endif
 
-#pragma GCC diagnostic ignored "-Wmissing-braces"
-#pragma GCC diagnostic ignored "-Woverride-init"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-
-
 const int indentAmt = 2;
 void indent( int level ) {
-        printf( "%*s", level, "" );
+        sout | wd( level, "" ) | nonl;
 }
 
@@ -40 +35 @@
 void printA( struct A a, int level ) {
         indent( level );
-        printf( "(A){ %d %d %p }\n", a.x, a.y, a.ptr );
+        sout | "(A){ " | a.x | a.y | a.ptr | " }";
 }
 
@@ -49 +44 @@
 void printB( struct B b, int level ) {
         indent( level );
-        printf( "(B){\n" );
+        sout | "(B){";
         printA( b.a0, level+indentAmt );
         printA( b.a1, level+indentAmt );
         indent( level );
-        printf( "}\n" );
+        sout | "}";
 }
 
@@ -63 +58 @@
 void printC( struct C c, int level ) {
         indent( level );
-        printf( "(C){\n" );
+        sout | "(C){";
         indent( level+indentAmt );
-        printf( "(int[]{ %d %d %d }\n", c.arr[0], c.arr[1], c.arr[2] );
+        sout | "(int[]{ " | c.arr[0] | c.arr[1] | c.arr[2] | " }";
         printB( c.b, level+indentAmt );
         indent( level );
-        printf( "}\n" );
+        sout | "}";
 }
 
@@ -79 +74 @@
 void printD( struct D d, int level ) {
         indent( level);
-        printf( "(D){ %d }\n", d.x );
+        sout | "(D){ " | d.x | "}";
 }
 
@@ -101 +96 @@
         } m;
 };
-struct Fred s1 AT= { .m.j = { 3 } };
+struct Fred s1 AT= { .m.j = 3 };
 struct Fred s2 AT= { .i = { [2] = 2 } };
 
@@ -129 +124 @@
 #endif
 
-        printf( "=====A=====\n" );
+        sout | "=====A=====";
         printA( y0, 0 );
         printA( y1, 0 );
         printA( y2, 0 );
-        printf( "=====A=====\n\n" );
+        sout | "=====A=====" | nl | nl;
 
         // initialize only first element (z0.a.x), leaving everything else default-initialized (zero), no nested curly-braces
@@ -172 +167 @@
         };
 
-        printf( "=====B=====\n" );
+        sout | "=====B=====";
         printB( z0, 0 );
         printB( z1, 0 );
@@ -179 +174 @@
         printB( z5, 0 );
         printB( z6, 0 );
-        printf( "=====B=====\n\n" );
+        sout | "=====B=====" | nl | nl;
 
         // TODO: what about extra things in a nested init? are empty structs skipped??
@@ -190 +185 @@
         };
 
-        printf( "=====C=====\n" );
+        sout | "=====C=====";
         printC( c1, 0 );
-        printf( "=====C=====\n\n" );
+        sout | "=====C=====" | nl | nl;
 
 #if ERROR
@@ -216 +211 @@
         // array designation
         int i[2] = { [1] = 3 };
-
         // allowed to have 'too many' initialized lists - essentially they are ignored.
         int i1 = { 3 };
@@ -247 +241 @@
         };
 
-        printf( "=====E=====\n" );
+        sout | "=====E=====";
         printA( e0.a, 0 );
         printA( e1.a, 0 );
         printA( e2.a, 0 );
         printB( e3.b, 0 );
-        printf( "=====E=====\n\n" );
+        sout | "=====E=====" | nl | nl;
 
         // special case of initialization: char[] can be initialized with a string literal
@@ -260 +254 @@
         const char c3[] = { 'a', 'b', 'c' };
         const char c4[][2] = { { 'a', 'b' }, { 'c', 'd'}, { 'c', 'd'} };
-        const char ch = c4[0][0];
 
         // more cases
@@ -270 +263 @@
         union foo { int i; double d; };
         union foo f = { .d = 4 };
-        int v1 = 0, v2 = 0, v4 = 0;
+        int v1, v2, v4;
         int w[6] = { [1] = v1, v2, [4] = v4 };
         int whitespace[256] = { [' '] = 1, ['\t'] = 1, ['\v'] = 1, ['\f'] = 1, ['\n'] = 1, ['\r'] = 1 };