Changes in tests/raii/dtor-early-exit.c [200fcb3:5a5d31a]

File:

• tests/raii/dtor-early-exit.c (modified) (16 diffs)

tests/raii/dtor-early-exit.c

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 11 22:05:24 2018
-// Update Count     : 9
+// Last Modified On : Sat Aug 11 07:58:39 2018
+// Update Count     : 8
 //
 
@@ -25 +25 @@
 // don't want these called
 void ?{}(A & a) { assert( false ); }
-void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name; a.x = (int*)malloc(); }
+void ?{}(A & a, const char * name) { a.name = name; sout | "construct " | name | endl; a.x = (int*)malloc(); }
 void ?{}(A & a, const char * name, int * ptr) { assert( false ); }
 
 A ?=?(A & a, A b) {  sout | "assign " | a.name | " " | b.name; return a; }
-void ?{}(A & a, A b) { sout | "copy construct " | b.name; a.x = (int*)malloc(); }
-void ^?{}(A & a) { sout | "destruct " | a.name; free(a.x); }
+void ?{}(A & a, A b) { sout | "copy construct " | b.name | endl; a.x = (int*)malloc(); }
+void ^?{}(A & a) { sout | "destruct " | a.name | endl; free(a.x); }
 
 // test returns
 void f(int i) {
-        sout | "f i=" | i;
+        sout | "f i=" | i | endl;
         A x = { "x" };  // construct x
         {
@@ -55 +55 @@
 void g() {
         for (int i = 0; i < 10; i++) {
-                sout | "g for i=" | i;
+                sout | "g for i=" | i | endl;
                 A x = { "x" };
                 // construct x
                 // destruct x
         }
-        sout | nl;
+        sout | endl;
         {
                 int i = 0;
                 while (i < 10) {
-                        sout | "g while i=" | i;
+                        sout | "g while i=" | i | endl;
                         A x = { "x" };
                         // construct x
@@ -71 +71 @@
                 }
         }
-        sout;
+        sout | endl;
         for (int i = 0; i < 10; i++) {
                 switch(10) {
@@ -78 +78 @@
                         case 10: {
                                 A y = { "y" };
-                                sout | "g switch i=" | i;
+                                sout | "g switch i=" | i | endl;
                                 // construct y
                                 break; // destruct y
                         }
                         default: {
-                                sout | "g switch i=" | i;
+                                sout | "g switch i=" | i | endl;
                                 A x = { "x" };
                                 // construct x
@@ -90 +90 @@
                 }
         }
-        sout | nl;
+        sout | endl;
         for (int k = 0; k < 2; k++) {
-                sout | "g for k=" | k;
+                sout | "g for k=" | k | endl;
                 L1: for (int i = 0; i < 10; i++) {
-                        sout | "g for i=" | i;
+                        sout | "g for i=" | i | endl;
 
                         A x = { "x" };
                         if (i == 2) {
-                                sout | "continue L1";
+                                sout | "continue L1" | endl;
                                 continue;  // destruct x
                         } else if (i == 3) {
-                                sout | "break L1";
+                                sout | "break L1" | endl;
                                 break;  // destruct x
                         }
 
                         L2: for (int j = 0; j < 10; j++) {
-                                sout | "g for j=" | j;
+                                sout | "g for j=" | j | endl;
                                 A y = { "y" };
                                 if (j == 0) {
-                                        sout | "continue L2";
+                                        sout | "continue L2" | endl;
                                         continue; // destruct y - missing because object that needs to be destructed is not a part of this block, it's a part of the for's block
                                 } else if (j == 1) {
-                                        sout | "break L2";
+                                        sout | "break L2" | endl;
                                         break;  // destruct y
                                 } else if (i == 1) {
-                                        sout | "continue L1";
+                                        sout | "continue L1" | endl;
                                         continue L1; // destruct x,y - note: continue takes you to destructors for block, so only generate destructor for y
                                 } else if (k == 1) {
-                                        sout | "break L1";
+                                        sout | "break L1" | endl;
                                         break L1;  // destruct x,y
                                 }
@@ -125 +125 @@
         }
 
-        sout | nl;
+        sout | endl;
         L3: if( 3 ) {
                 A w = { "w" };
                 if( 4 ) {
                         A v = { "v" };
-                        sout | "break L3";
+                        sout | "break L3" | endl;
                         break L3;
                 }
@@ -144 +144 @@
         // * if S_L-S_G is non-empty, error
         // * emit destructors for all variables in S_G-S_L
-        sout | "h";
+        sout | "h" | endl;
         {
                 L0: ;
@@ -152 +152 @@
                         A y = { "y" };
                         // S_L1 = { y }
-                L1: sout | "L1";
+                L1: sout | "L1" | endl;
                         A x = { "x" };
                         // S_L2 = { y, x }
-                L2: sout | "L2";
+                L2: sout | "L2" | endl;
                         if (i == 0) {
                                 ++i;
-                                sout | "goto L1";
+                                sout | "goto L1" | endl;
                                 // S_G = { y, x }
                                 goto L1;  // jump back, destruct b/c before x definition
@@ -165 +165 @@
                         } else if (i == 1) {
                                 ++i;
-                                sout | "goto L2";
+                                sout | "goto L2" | endl;
                                 // S_G = { y, x }
                                 goto L2;  // jump back, do not destruct
@@ -172 +172 @@
                         } else if (i == 2) {
                                 ++i;
-                                sout | "goto L3";
+                                sout | "goto L3" | endl;
                                 // S_G = { y, x }
                                 goto L3;  // jump ahead, do not destruct
@@ -180 +180 @@
                                 ++i;
                                 A z = { "z" };
-                                sout | "goto L3-2";
+                                sout | "goto L3-2" | endl;
                                 // S_G = { z, y, x }
                                 goto L3;
@@ -187 +187 @@
                         } else {
                                 ++i;
-                                sout | "goto L4";
+                                sout | "goto L4" | endl;
                                 // S_G = { y, x }
                                 goto L4;  // jump ahead, destruct b/c left block x was defined in
@@ -194 +194 @@
                         }
                         // S_L3 = { y, x }
-                L3: sout | "L3";
-                        sout | "goto L2-2";
+                L3: sout | "L3" | endl;
+                        sout | "goto L2-2" | endl;
                         // S_G = { y, x }
                         goto L2; // jump back, do not destruct
@@ -202 +202 @@
         }
         // S_L4 = {}
-        L4: sout | "L4";
+        L4: sout | "L4" | endl;
         if (i == 4) {
-                sout | "goto L0";
+                sout | "goto L0" | endl;
                 // S_G = {}
                 goto L0;
@@ -240 +240 @@
                 f(i);
         }
-        sout | nl;
+        sout | endl;
         g();
-        sout | nl;
+        sout | endl;
         h();