Changeset 3d5701e for tests/loopctrl.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

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

tests/loopctrl.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:05:05 2019
-// Update Count     : 106
+// Last Modified On : Thu Dec 12 17:55:26 2019
+// Update Count     : 108
 // 
 
@@ -43 +43 @@
         for ( 1 ) { sout | "A"; }                                                       sout | nl;
         for ( 10 ) { sout | "A"; }                                                      sout | nl;
+        for ( = 10 ) { sout | "A"; }                                            sout | nl;
         for ( 1 ~= 10 ~ 2 ) { sout | "B"; }                                     sout | nl;
         for ( 10 -~= 1 ~ 2 ) { sout | "C"; }                            sout | nl;
@@ -49 +50 @@
 
         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;
@@ -87 +89 @@
         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;