Index: tests/.expect/loop_else.txt =================================================================== --- tests/.expect/loop_else.txt (revision 52be59480e01c91896b8d594c5003c1037afb3e0) +++ tests/.expect/loop_else.txt (revision c48b61c5e53ed3e2044063900036e4e91888ea43) @@ -33,5 +33,5 @@ 0 1 2 3 4 5 6 7 8 9 else 0 1 2 3 4 5 6 7 8 9 10 else -10 9 8 7 6 5 4 3 2 1 else +10 9 8 7 6 5 4 3 2 1 0 else 3 6 9 else Index: tests/.expect/loopctrl.txt =================================================================== --- tests/.expect/loopctrl.txt (revision 52be59480e01c91896b8d594c5003c1037afb3e0) +++ tests/.expect/loopctrl.txt (revision c48b61c5e53ed3e2044063900036e4e91888ea43) @@ -31,5 +31,5 @@ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 10 -10 9 8 7 6 5 4 3 2 1 +10 9 8 7 6 5 4 3 2 1 0 3 6 9 @@ -61,2 +61,49 @@ 0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 +A A A A A A A A A A +B B B B B B B B B B B +C C C C C C C C C C +D D D D D D D D D D D +A A A A A A A A A A +B B B B B B B B B B B +C C C C C C C C C C +D D D D D D D D D D D +A A A A A +B B B B B B +C C C C C +D D D D D D +0 1 2 3 4 5 6 7 8 9 +0 1 2 3 4 5 6 7 8 9 10 +10 9 8 7 6 5 4 3 2 1 +10 9 8 7 6 5 4 3 2 1 0 +0 1 2 3 4 5 6 7 8 9 +0 1 2 3 4 5 6 7 8 9 10 +10 9 8 7 6 5 4 3 2 1 +10 9 8 7 6 5 4 3 2 1 0 +0 2 4 6 8 +0 2 4 6 8 10 +10 8 6 4 2 +10 8 6 4 2 0 +0 1 2 3 4 5 6 7 8 9 +0 1 2 3 4 5 6 7 8 9 +0 1 2 3 4 5 6 7 8 9 10 +10 9 8 7 6 5 4 3 2 1 +10 9 8 7 6 5 4 3 2 1 0 +0 1 2 3 4 5 6 7 8 9 +0 1 2 3 4 5 6 7 8 9 10 +10 9 8 7 6 5 4 3 2 1 +10 9 8 7 6 5 4 3 2 1 0 +0 2 4 6 8 +0 2 4 6 8 10 +10 8 6 4 2 +10 8 6 4 2 0 +0 1 2 3 4 5 6 7 8 9 +0 -1 -2 -3 -4 -5 -6 -7 -8 -9 +0 2 4 6 8 +0 -2 -4 -6 -8 +0 1 2 3 4 5 6 7 8 9 +0 2 4 6 8 +0 -2 -4 -6 -8 +0 2 4 6 8 +0 -2 -4 -6 -8 +0 1 2 3 4 5 6 7 8 9 Index: tests/loop_else.cfa =================================================================== --- tests/loop_else.cfa (revision 52be59480e01c91896b8d594c5003c1037afb3e0) +++ tests/loop_else.cfa (revision c48b61c5e53ed3e2044063900036e4e91888ea43) @@ -20,28 +20,30 @@ int main() { - 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; + // Test some loop options. - do { sout | "false"; } while (false) 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; - for ( 0 ) { sout | "A"; } else { sout | "else"; } sout | "zero" | nl; + do { sout | "false"; } while (false) else { sout | "else"; } sout | nl | 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 ( 1 ~= 10 ~ 2 ) { sout | "B"; } else { sout | "else"; } sout | nl; - for ( 10 -~= 1 ~ 2 ) { sout | "C"; } else { sout | "else"; } sout | nl; + for ( 1 -~= 10 ~ 2 ) { sout | "C"; } else { sout | "else"; } sout | nl; for ( 0.5 ~ 5.5 ) { sout | "D"; } else { sout | "else"; } sout | nl; - for ( 5.5 -~ 0.5 ) { sout | "E"; } else { sout | "else"; } sout | nl | nl; + for ( 0.5 -~ 5.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; 1 ~= 10 ~ 2 ) { sout | i; } else { sout | "else"; } sout | nl; - for ( i; 10 -~= 1 ~ 2 ) { sout | i; } else { sout | "else"; } sout | nl; + for ( i; 1 -~= 10 ~ 2 ) { 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 ( i; 0.5 -~ 5.5 ) { sout | i; } else { sout | "else"; } sout | nl; for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; } sout | nl; - for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; } else { sout | "else"; } sout | nl | nl; + for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; } else { sout | "else"; } sout | nl | nl; // @ means do nothing @@ -77,5 +79,5 @@ for ( i; N ) { sout | i; } else { sout | "else"; } sout | nl; for ( i; ~= N ) { sout | i; } else { sout | "else"; } sout | nl; - for ( i; N -~ 0 ) { sout | i; } else { sout | "else"; } sout | nl | nl; + for ( i; -~= N ) { sout | i; } else { sout | "else"; } sout | nl | nl; const int start = 3, comp = 10, inc = 2; @@ -90,8 +92,8 @@ for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl; 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; - 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 ( 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 ( i; 10 : j; -5 ~ @ ) { sout | i | j; } else { sout | "else"; } sout | nl; Index: tests/loopctrl.cfa =================================================================== --- tests/loopctrl.cfa (revision 52be59480e01c91896b8d594c5003c1037afb3e0) +++ tests/loopctrl.cfa (revision c48b61c5e53ed3e2044063900036e4e91888ea43) @@ -10,6 +10,6 @@ // Created On : Wed Aug 8 18:32:59 2018 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Aug 8 17:36:57 2022 -// Update Count : 116 +// Last Modified On : Tue Aug 9 17:29:08 2022 +// Update Count : 144 // @@ -19,108 +19,72 @@ // Test all possible loop syntax. - int s, c, i; - - for ( c ) {} // start 0 - for ( ~= c ) {} // start 0 - for ( -~ c ) {} // start c - for ( -~= c ) {} // start c - - for ( @ ~ c ) {} // start 0 - for ( @ ~= c ) {} // start 0 - for ( @ -~ c ) {} // start c - for ( @ -~= c ) {} // start c - - for ( @ ~ c ~ i ) {} // start 0 - for ( @ ~= c ~ i ) {} // start 0 - for ( @ -~ c ~ i ) {} // start c - for ( @ -~= c ~ i ) {} // start c - - for ( s ~ c ) {} // start s - for ( s ~= c ) {} // start s - for ( s -~ c ) {} // start c - for ( s -~= c ) {} // start c - - for ( s ~ c ~ i ) {} // start s - for ( s ~= c ~ i ) {} // start s - for ( s -~ c ~ i ) {} // start c - for ( s -~= c ~ i ) {} // start c - - for ( j; c ) {} // start 0 - for ( j; ~= c ) {} // start 0 - for ( j; -~ c ) {} // start c - for ( j; -~= c ) {} // start c - - for ( j; @ ~ c ) {} // start 0 - for ( j; @ ~= c ) {} // start 0 - for ( j; @ -~ c ) {} // start c - for ( j; @ -~= c ) {} // start c - - for ( j; @ ~ c ~ i ) {} // start 0 - for ( j; @ ~= c ~ i ) {} // start 0 - for ( j; @ -~ c ~ i ) {} // start c - for ( j; @ -~= c ~ i ) {} // start c - - for ( j; s ~ c ) {} // start s - for ( j; s ~= c ) {} // start s - for ( j; s -~ c ) {} // start c - for ( j; s -~= c ) {} // start c - - for ( j; s ~ c ~ i ) {} // start s - for ( j; s ~= c ~ i ) {} // start s - for ( j; s -~ c ~ i ) {} // start c - for ( j; s -~= c ~ i ) {} // start c + int s = 0, c = 10, i = 2; + + for ( c ) { sout | "A"; } sout | nl; + for ( ~= c ) { sout | "B"; } sout | nl; + for ( -~ c ) { sout | "C"; } sout | nl; + for ( -~= c ) { sout | "D"; } sout | nl; + + for ( s ~ c ) { sout | "A"; } sout | nl; + for ( s ~= c ) { sout | "B"; } sout | nl; + for ( s -~ c ) { sout | "C"; } sout | nl; + for ( s -~= c ) { sout | "D"; } sout | nl; + + for ( s ~ c ~ i ) { sout | "A"; } sout | nl; + for ( s ~= c ~ i ) { sout | "B"; } sout | nl; + for ( s -~ c ~ i ) { sout | "C"; } sout | nl; + for ( s -~= c ~ i ) { sout | "D"; } sout | nl; + + for ( j; c ) { sout | j; } sout | nl; + for ( j; ~= c ) { sout | j; } sout | nl; + for ( j; -~ c ) { sout | j; } sout | nl; + for ( j; -~= c ) { sout | j; } sout | nl; + + for ( j; s ~ c ) { sout | j; } sout | nl; + for ( j; s ~= c ) { sout | j; } sout | nl; + for ( j; s -~ c ) { sout | j; } sout | nl; + for ( j; s -~= c ) { sout | j; } sout | nl; + + for ( j; s ~ c ~ i ) { sout | j; } sout | nl; + for ( j; s ~= c ~ i ) { sout | j; } sout | nl; + for ( j; s -~ c ~ i ) { sout | j; } sout | nl; + for ( j; s -~= c ~ i ) { sout | j; } sout | nl; // CANNOT DIRECTLY INITIALIZE INDEX VARIABLE, ONLY SINGLE LOOP INDEX VARIABLE IN DECLARATION - for ( j; c ) {} // start 0 - for ( int j; c ) {} // start 0 - for ( int j; ~= c ) {} // start 0 - for ( int j; -~ c ) {} // start c - for ( int j; -~= c ) {} // start c - - for ( int j; @ ~ c ) {} // start 0 - for ( int j; @ ~= c ) {} // start 0 - for ( int j; @ -~ c ) {} // start c - for ( int j; @ -~= c ) {} // start c - - for ( int j; @ ~ c ~ i ) {} // start 0 - for ( int j; @ ~= c ~ i ) {} // start 0 - for ( int j; @ -~ c ~ i ) {} // start c - for ( int j; @ -~= c ~ i ) {} // start c - - for ( int j; s ~ c ) {} // start s - for ( int j; s ~= c ) {} // start s - for ( int j; s -~ c ) {} // start c - for ( int j; s -~= c ) {} // start c - - for ( int j; s ~ c ~ i ) {} // start s - for ( int j; s ~= c ~ i ) {} // start s - for ( int j; s -~ c ~ i ) {} // start c - for ( int j; s -~= c ~ i ) {} // start c - - for ( s ~ @ ) {} // start s - for ( s -~ @ ) {} // start s - for ( s ~ @ ~ i ) {} // start s - for ( s -~ @ ~ i ) {} // start s - for ( s ~ @ ~ @ ) {} // start s - - for ( j; s ~ @ ) {} // start s - for ( j; s -~ @ ) {} // start s - for ( j; s ~ @ ~ i ) {} // start s - for ( j; s -~ @ ~ i ) {} // start s - for ( j; s ~ @ ~ @ ) {} // start s - - for ( int j; s ~ @ ) {} // start s - for ( int j; s -~ @ ) {} // start s - for ( int j; s ~ @ ~ i ) {} // start s - for ( int j; s -~ @ ~ i ) {} // start s - for ( int j; s ~ @ ~ @ ) {} // start s + for ( j; c ) { sout | j; } sout | nl; + for ( int j; c ) { sout | j; } sout | nl; + for ( int j; ~= c ) { sout | j; } sout | nl; + for ( int j; -~ c ) { sout | j; } sout | nl; + for ( int j; -~= c ) { sout | j; } sout | nl; + + for ( int j; s ~ c ) { sout | j; } sout | nl; + for ( int j; s ~= c ) { sout | j; } sout | nl; + for ( int j; s -~ c ) { sout | j; } sout | nl; + for ( int j; s -~= c ) { sout | j; } sout | nl; + + for ( int j; s ~ c ~ i ) { sout | j; } sout | nl; + for ( int j; s ~= c ~ i ) { sout | j; } sout | nl; + for ( int j; s -~ c ~ i ) { sout | j; } sout | nl; + for ( int j; s -~= c ~ i ) { sout | j; } sout | nl; + + for ( j; s ~ @ ) { if ( j == 10 ) break; sout | j; } sout | nl; + for ( j; s -~ @ ) { if ( j == -10 ) break; sout | j; } sout | nl; + for ( j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; } sout | nl; + for ( j; s -~ @ ~ i ) { if ( j == -10 ) break; sout | j; } sout | nl; + for ( j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl; + + for ( int j; s ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl; + for ( int j; s -~ @ ) { if ( j == -10 ) break; sout | j; j -= 1; } sout | nl; + for ( int j; s ~ @ ~ i ) { if ( j == 10 ) break; sout | j; } sout | nl; + for ( int j; s -~ @ ~ i ) { if ( j == -10 ) break; sout | j; } sout | nl; + for ( int j; s ~ @ ~ @ ) { if ( j == 10 ) break; sout | j; j += 1; } sout | nl; // enum E { A, B, C, D }; - // for ( e; A ~= C ) {} - // for ( e; A ~= D ) {} - // for ( e; A -~= D ~ 2 ) {} - // for ( e; E ) {} - // for ( e; -~ E ) {} + // 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; } } @@ -156,16 +120,16 @@ for ( ~= 10 ) { sout | "A"; } sout | nl; for ( 1 ~= 10 ~ 2 ) { sout | "B"; } sout | nl; - for ( 10 -~= 1 ~ 2 ) { sout | "C"; } sout | nl; + for ( 1 -~= 10 ~ 2 ) { sout | "C"; } sout | nl; for ( 0.5 ~ 5.5 ) { sout | "D"; } sout | nl; - for ( 5.5 -~ 0.5 ) { sout | "E"; } sout | nl | nl; + for ( 0.5 -~ 5.5 ) { sout | "E"; } sout | nl | nl; for ( i; 10 ) { sout | i; } sout | nl; for ( i; ~= 10 ) { sout | i; } sout | nl; for ( i; 1 ~= 10 ~ 2 ) { sout | i; } sout | nl; - for ( i; 10 -~= 1 ~ 2 ) { sout | i; } sout | nl; + for ( i; 1 -~= 10 ~ 2 ) { sout | i; } sout | nl; for ( i; 0.5 ~ 5.5 ) { sout | i; } sout | nl; - for ( i; 5.5 -~ 0.5 ) { sout | i; } sout | nl; + for ( i; 0.5 -~ 5.5 ) { sout | i; } sout | nl; for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } sout | nl; - for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; } sout | nl | nl; + for ( ui; 2u -~= 10u ~ 2u ) { sout | ui; } sout | nl | nl; // @ means do nothing @@ -200,6 +164,6 @@ for ( N ) { sout | "N"; } sout | nl; for ( i; N ) { sout | i; } sout | nl; - for ( i; ~= N ) { sout | i; } sout | nl; - for ( i; N -~ 0 ) { sout | i; } sout | nl | nl; + for ( i; ~= N ) { sout | i; } sout | nl; + for ( i; -~= N ) { sout | i; } sout | nl | nl; const int start = 3, comp = 10, inc = 2; @@ -214,8 +178,8 @@ for ( s; (S){0} ~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl; sout | nl; - for ( s; (S){10,10} -~ (S){0} ) { sout | s; } sout | nl; - for ( s; (S){10,10} -~ (S){0} ~ (S){1} ) { sout | s; } sout | nl; - for ( s; (S){10,10} -~= (S){0} ) { sout | s; } sout | nl; - for ( s; (S){10,10} -~= (S){0} ~ (S){1} ) { sout | s; } sout | nl | nl; + for ( s; (S){0} -~ (S){10,10} ) { sout | s; } sout | nl; + for ( s; (S){0} -~ (S){10,10} ~ (S){1} ) { sout | s; } sout | nl; + for ( s; (S){0} -~= (S){10,10} ) { sout | s; } sout | nl; + for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl | nl; for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } sout | nl; @@ -232,4 +196,6 @@ for ( j; -5 -~ @ ~ 2 : k; 1.5 ~ @ : i; 10 ) { sout | i | j | k; } sout | nl; for ( k; 1.5 ~ @ : j; -5 -~ @ ~ 2 : i; 10 ) { sout | i | j | k; } sout | nl; + + fred(); }