Changes in tests/ctrl-flow/loopctrl.cfa [8789ae4:72abc90a]

File:

• tests/ctrl-flow/loopctrl.cfa (modified) (5 diffs)

tests/ctrl-flow/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  2 08:42:55 2024
-// Update Count     : 185
+// Last Modified On : Thu Jun 27 11:00:09 2024
+// Update Count     : 161
 // 
 
 #include <fstream.hfa>
-#include <enum.hfa>
 
 void fred() {
@@ -82 +81 @@
         for ( int j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl;
 
-        enum(int) E { A, B, C, D };
-//      for ( E e; A ~= C ) { sout | e; } sout | nl;
-//      for ( e; A ~= D ) { sout | e; } sout | nl;
-//      for ( e; A -~= D ~ 2 ) { sout | e; } sout | nl;
-        for ( e; E ) { sout | e; } sout | nl;
-        for ( e; -~= E ) { sout | e; } sout | nl;
+        // enum E { A, B, C, D };
+        // for ( e; A ~= C ) { sout | j; }
+        // for ( e; A ~= D ) { sout | j; }
+        // for ( e; A -~= D ~ 2 ) { sout | j; }
+        // for ( e; E ) { sout | j; }
+        // for ( e; -~ E ) { sout | j; }
 }
 
@@ -96 +95 @@
 void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
 void ?{}( S & s, one_t ) { s.[i, j] = 1; }
-int ?<?( S s1, S s2 ) { return s1.i < s2.i || s1.j < s2.j; }
-int ?<=?( S s1, S s2 ) { return s1.i <= s2.i || s1.j <= s2.j; }
-int ?>?( S s1, S s2 ) { return s1.i > s2.i || s1.j > s2.j; }
-int ?>=?( S s1, S s2 ) { return s1.i >= s2.i || s1.j >= s2.j; }
-S ?+=?( S & s1, S s2 ) { s1.i += s2.i; s1.j += s2.j; return s1; }
-S ?+=?( S & s, one_t ) { s.i += 1; s.j += 1; return s; }
-S ?-=?( S & s1, S s2 ) { s1.i -= s2.i; s1.j -= s2.j; return s1; }
-S ?-=?( S & s, one_t ) { s.i -= 1; s.j -= 1; return s; }
-ofstream & ?|?( ofstream & os, S s ) { return os | '(' | s.i | s.j | ')'; }
-void & ?|?( ofstream & os, S s ) { (ofstream &)(os | s); ends( os ); }
+int ?<?( S t1, S t2 ) { return t1.i < t2.i && t1.j < t2.j; }
+int ?<=?( S t1, S t2 ) { return t1.i <= t2.i && t1.j <= t2.j; }
+int ?>?( S t1, S t2 ) { return t1.i > t2.i && t1.j > t2.j; }
+int ?>=?( S t1, S t2 ) { return t1.i >= t2.i && t1.j >= t2.j; }
+S ?+=?( S & t1, S t2 ) { t1.i += t2.i; t1.j += t2.j; return t1; }
+S ?+=?( S & t, one_t ) { t.i += 1; t.j += 1; return t; }
+S ?-=?( S & t1, S t2 ) { t1.i -= t2.i; t1.j -= t2.j; return t1; }
+S ?-=?( S & t, one_t ) { t.i -= 1; t.j -= 1; return t; }
+ofstream & ?|?( ofstream & os, S v ) { return os | '(' | v.i | v.j | ')'; }
+void & ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
 
 int main() {
@@ -184 +183 @@
         for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } sout | nl;
 
-        for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | nl; // 0 does not work
+        for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } sout | nl;
         for ( s; (S){10,10} ) { sout | s; } sout | nl;
         sout | nl;
@@ -197 +196 @@
         for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl | nl;
 
-        int i = 10;
-        double d = 10.;
-        char c = 'e';
-        S s = { 7 };
-
-        for ( anon; 3 ~ i ) sout | anon;                                        sout | nl;
-        for ( anon; 3 ~ i ) sout | anon;                                        sout | nl;
-        for ( anon; 3 -~ i ) sout | anon;                                       sout | nl;
-        for ( anon; 3.5 ~ d ) sout | anon;                                      sout | nl;
-        for ( anon; 'a' ~= c ) sout | anon;                                     sout | nl;
-        for ( anon; 'a' -~= c ) sout | anon;                            sout | nl;
-        for ( anon; (S){0} ~ s ) sout | anon;                           sout | nl; // 0 does not work
-        for ( anon; (S){1} ~ s ) sout | anon;                           sout | nl; // 1 does not work
-        for ( anon; (S){3} ~ s ) sout | anon;                           sout | nl;
-        for ( anon; (S){3} -~ s ) sout | anon;                          sout | nl | nl;
-
         fred();
 }