Changeset ff36907

Timestamp:

Aug 9, 2022, 10:21:29 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

4962741

Parents:

571f220

Message:

update loop-control test and expected output

Location:

tests

Files:

• .expect/loopctrl.txt (modified) (2 diffs)
• loopctrl.cfa (modified) (3 diffs)

tests/.expect/loopctrl.txt

@@ -35 +35 @@
 3 6 9
 
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+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
+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 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
 (0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
@@ -48 +61 @@
 (10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
 
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
-
-0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
-0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
-0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
-0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
-
-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
-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

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug  9 17:29:08 2022
-// Update Count     : 144
+// Last Modified On : Tue Aug  9 20:42:27 2022
+// Update Count     : 145
 // 
 
@@ -170 +170 @@
         for ( i; start ~ comp ~ inc + 1 ) { sout | i; }         sout | nl | nl;
 
+        for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } sout | nl;
+        for ( i; 10 : j; -5 -~ @ ) { sout | i | j; } sout | nl;
+        for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } sout | nl;
+        for ( i; 10 : j; -5 -~ @ ~ 2 ) { sout | i | j; } sout | nl | nl;
+
+        for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } sout | nl;
+        for ( j; -5 -~ @ : i; 10 ) { sout | i | j; } sout | nl;
+        for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl;
+        for ( j; -5 -~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl | nl;
+
+        for ( j; -5 -~ @ ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } sout | nl;
+        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;
+
         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;
@@ -183 +197 @@
         for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } sout | nl | nl;
 
-        for ( i; 10 : j; -5 ~ @ ) { sout | i | j; } sout | nl;
-        for ( i; 10 : j; -5 -~ @ ) { sout | i | j; } sout | nl;
-        for ( i; 10 : j; -5 ~ @ ~ 2 ) { sout | i | j; } sout | nl;
-        for ( i; 10 : j; -5 -~ @ ~ 2 ) { sout | i | j; } sout | nl | nl;
-
-        for ( j; -5 ~ @ : i; 10 ) { sout | i | j; } sout | nl;
-        for ( j; -5 -~ @ : i; 10 ) { sout | i | j; } sout | nl;
-        for ( j; -5 ~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl;
-        for ( j; -5 -~ @ ~ 2 : i; 10 ) { sout | i | j; } sout | nl | nl;
-
-        for ( j; -5 -~ @ ~ 2 : i; 10 : k; 1.5 ~ @ ) { sout | i | j | k; } sout | nl;
-        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();
 }