Changeset 933f32f for tests/loopctrl.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• tests/loopctrl.cfa (modified) (3 diffs)

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 23 23:00:29 2018
-// Update Count     : 79
+// Last Modified On : Sat Apr 13 11:03:09 2019
+// Update Count     : 104
 // 
 
@@ -54 +54 @@
         for ( i; 5.5 -~ 0.5 ) { sout | i; }                                     sout | nl;
         for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; }                       sout | nl;
-        for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; }                      sout | nl | nl | nl;
+        for ( ui; 10u -~= 2u ~ 2u ) { sout | ui; }                      sout | nl | nl;
 
+        // @ means do nothing
+        for ( i; 1 ~ @ ) {
+          if ( i > 10 ) break;
+                sout | i;
+        }                                                                                                       sout | nl;
+        for ( i; 10 -~ @ ) {
+          if ( i < 0 ) break;
+                sout | i;
+        }                                                                                                       sout | nl;
+        for ( i; 2 ~ @ ~ 2 ) {
+          if ( i > 10 ) break;
+                sout | i;
+        }                                                                                                       sout | nl;
+        for ( i; 2.1 ~ @ ~ @ ) {
+          if ( i > 10.5 ) break;
+                sout | i;
+                i += 1.7;
+        }                                                                                                       sout | nl;
+        for ( i; 10 -~ @ ~ 2 ) {
+          if ( i < 0 ) break;
+                sout | i;
+        }                                                                                                       sout | nl;
+        for ( i; 12.1 ~ @ ~ @ ) {
+          if ( i < 2.5 ) break;
+                sout | i;
+                i -= 1.7;
+        }                                                                                                       sout | nl | nl;
+        
         enum { N = 10 };
         for ( N ) { sout | "N"; }                                                       sout | nl;
         for ( i; N ) { sout | i; }                                                      sout | nl;
-        for ( i; N -~ 0 ) { sout | i; }                                         sout | nl | nl | nl;
+        for ( i; N -~ 0 ) { sout | i; }                                         sout | nl | nl;
 
         const int start = 3, comp = 10, inc = 2;
         for ( i; start ~ comp ~ inc + 1 ) { sout | i; }         sout | nl | nl;
 
-        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;
@@ -76 +103 @@
         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;
+        for ( s; (S){10,10} -~= (S){0} ~ (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;
 }