Changes in tests/loop_else.cfa [283876d:f6737ae1]

File:

• tests/loop_else.cfa (modified) (5 diffs)

tests/loop_else.cfa

@@ -20 +20 @@
 
 int main() {
-        // Test some loop options.
+    sout | nlOff;                                                                               // turn off auto newline
+        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;
 
-        sout | nlOff;                                                                           // turn off auto newline
-        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;
 
-        do { sout | "false"; } while (false) else { sout | "else"; }                                    sout | nl | nl;
-
-        for ( 0 ) { sout | "A"; } else { sout | "else"; }                                                               sout | "zero" | nl;
+        for ( 0 ) { sout | "A"; } else { sout | "else"; }                                                   sout | "zero" | nl;
         for ( 1 ) { sout | "A"; } else { sout | "else"; }                                                               sout | nl;
-        for ( 10 ) { sout | "A"; } else { sout | "else"; }                                                              sout | nl;
-        for ( ~= 10 ) { sout | "A"; } else { sout | "else"; }                                                   sout | nl;
+        for ( 10 ) { sout | "A"; } else { sout | "else"; }                                                          sout | nl;
+        for ( = 10 ) { sout | "A"; } else { sout | "else"; }                                                    sout | nl;
         for ( 1 ~= 10 ~ 2 ) { sout | "B"; } else { sout | "else"; }                                             sout | nl;
-        for ( 1 -~= 10 ~ 2 ) { sout | "C"; } else { sout | "else"; }                                    sout | nl;
+        for ( 10 -~= 1 ~ 2 ) { sout | "C"; } else { sout | "else"; }                                    sout | nl;
         for ( 0.5 ~ 5.5 ) { sout | "D"; } else { sout | "else"; }                                               sout | nl;
-        for ( 0.5 -~ 5.5 ) { sout | "E"; } else { sout | "else"; }                                              sout | nl | nl;
+        for ( 5.5 -~ 0.5 ) { sout | "E"; } else { sout | "else"; }                                              sout | nl | nl;
 
         for ( i; 10 ) { sout | i; } else { sout | "else"; }                                                             sout | nl;
-        for ( i; ~= 10 ) { sout | i; } else { sout | "else"; }                                                  sout | nl;
+        for ( i; = 10 ) { sout | i; } else { sout | "else"; }                                                   sout | nl;
         for ( i; 1 ~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }                                    sout | nl;
-        for ( i; 1 -~= 10 ~ 2 ) { sout | i; } else { sout | "else"; }                                   sout | nl;
+        for ( i; 10 -~= 1 ~ 2 ) { sout | i; } else { sout | "else"; }                                   sout | nl;
         for ( i; 0.5 ~ 5.5 ) { sout | i; } else { sout | "else"; }                                              sout | nl;
-        for ( i; 0.5 -~ 5.5 ) { sout | i; } else { sout | "else"; }                                             sout | nl;
+        for ( i; 5.5 -~ 0.5 ) { sout | i; } else { sout | "else"; }                                             sout | nl;
         for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }                               sout | nl;
-        for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; }                              sout | nl | nl;
+        for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; } else { sout | "else"; }                              sout | nl | nl;
 
         // @ means do nothing
@@ -52 +50 @@
                 sout | i;
         } else { sout | "else"; }                                                                                                               sout | nl;
-        for ( i; @ -~ 10 ) {
+        for ( i; 10 -~ @ ) {
           if ( i < 0 ) break;
                 sout | i;
@@ -65 +63 @@
                 i += 1.7;
         } else { sout | "else"; }                                                                                                               sout | nl;
-        for ( i; @ -~ 10 ~ 2 ) {
+        for ( i; 10 -~ @ ~ 2 ) {
           if ( i < 0 ) break;
                 sout | i;
@@ -78 +76 @@
         for ( N ) { sout | "N"; } else { sout | "else"; }                                                       sout | nl;
         for ( i; N ) { sout | i; } else { sout | "else"; }                                                      sout | nl;
-        for ( i; ~= N ) { sout | i; } else { sout | "else"; }                                           sout | nl;
-        for ( i; -~= N ) { sout | i; } else { sout | "else"; }                                          sout | nl | nl;
+        for ( i; = N ) { sout | i; } else { sout | "else"; }                                            sout | nl;
+        for ( i; N -~ 0 ) { sout | i; } else { sout | "else"; }                                         sout | nl | nl;
 
         const int start = 3, comp = 10, inc = 2;
         for ( i; start ~ comp ~ inc + 1 ) { sout | i; } else { sout | "else"; }         sout | nl | nl;
-
-        for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( i; 10 : j; @ -~ -5 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( i; 10 : j; @ -~ -5 ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
-
-        for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( j; @ -~ -5 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
-        for ( j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
-
-        for ( j; @ -~ -5 ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
-        for ( j; @ -~ -5 ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
-        for ( k; 1.5 ~ @ : j; @ -~ -5 ~ 2 : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
 
         for ( S s = (S){0}; s < (S){10,10}; s += (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
@@ -106 +90 @@
         for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
         sout | nl;
-        for ( s; (S){0} -~  (S){10,10} ) { sout | s; } else { sout | "else"; }           sout | nl;
-        for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
-        for ( s; (S){0} -~= (S){10,10} ) { sout | s; } else { sout | "else"; }           sout | nl;
-        for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
+        for ( s; (S){10,10} -~ (S){0} ) { sout | s; } else { sout | "else"; }            sout | nl;
+        for ( s; (S){10,10} -~ (S){0} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+        for ( s; (S){10,10} -~= (S){0} ) { sout | s; } else { sout | "else"; }           sout | nl;
+        for ( s; (S){10,10} -~= (S){0} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
+
+        for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( i; 10 : j; -5 -~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( i; 10 : j; -5 -~ @ ~ 2 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
+
+        for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( j; -5 -~ @ : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl;
+        for ( j; -5 -~ @ ~ 2 : i; 10 ) { sout | i | j; } else { sout | "else"; } sout | nl | nl;
+
+        for ( j; -5 -~ @ ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
+        for ( j; -5 -~ @ ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
+        for ( k; 1.5 ~ @ : j; -5 -~ @ ~ 2 : i; 10 ) { sout | i | j | k; } else { sout | "else"; } sout | nl;
 }