Changeset bedb40e for tests

Timestamp:

Sep 10, 2018, 5:17:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

67982887, 9fce933a

Parents:

0cf9ffd (diff), e15ba975 (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' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/forctrl.txt (modified) (1 diff)
• forctrl.c (modified) (2 diffs)

tests/.expect/forctrl.txt

@@ -2 +2 @@
 empty
 empty
-X X X X X X X X X X
-Y Y Y Y Y
-Z Z Z Z Z
+
+A
+A A
+A A A A A A A A A A
+B B B B B
+C C C C C
+D D D D D
+E E E E E
 0 1 2 3 4 5 6 7 8 9
 0 1 2 3 4 5 6 7 8 9
+1 3 5 7 9
+10 8 6 4 2
 0.5 1.5 2.5 3.5 4.5
+5.5 4.5 3.5 2.5 1.5
 2 4 6 8 10
-2 4 6 8 10
+10 8 6 4 2
 3 6 9
 (0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)

tests/forctrl.c

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 16 09:25:47 2018
-// Update Count     : 6
+// Last Modified On : Thu Aug 30 17:12:12 2018
+// Update Count     : 43
 // 
 
@@ -33 +33 @@
         do { sout | "empty"; break; } while (); sout | endl;
         for () { sout | "empty"; break; }               sout | endl;
-        for ( 10 ) { sout | "X"; }                              sout | endl;
-        for ( 0.5 ~ 5.5 ) { sout | "Y"; }               sout | endl;
-        for ( 2 ~= 10 ~ 2 ) { sout | "Z"; }             sout | endl;
+
+        for ( 0 ) { sout | "A"; }                               sout | endl;
+        for ( 1 ) { sout | "A"; }                               sout | endl;
+        for ( 2 ) { sout | "A"; }                               sout | endl;
+        for ( 10 ) { sout | "A"; }                              sout | endl;
+
+        for ( 1 ~= 10 ~ 2 ) { sout | "B"; }             sout | endl;
+        for ( 10 -~= 1 ~ -2 ) { sout | "C"; }   sout | endl;
+        for ( 0.5 ~ 5.5 ) { sout | "D"; }               sout | endl;
+        for ( 5.5 -~ 0.5 ) { sout | "E"; }              sout | endl;
+
         for ( i; 10 ) { sout | i; }                             sout | endl;
         for ( j; 10 ) { sout | j; }                             sout | endl;
+
+        for ( i; 1 ~= 10 ~ 2 ) { sout | i; }    sout | endl;
+        for ( i; 10 -~= 1 ~ -2 ) { sout | i; }  sout | endl;
         for ( i; 0.5 ~ 5.5 ) { sout | i; }              sout | endl;
-        for ( i; 2 ~= 10 ~ 2 ) { sout | i; }    sout | endl;
+        for ( i; 5.5 -~ 0.5 ) { sout | i; }             sout | endl;
+
         for ( ui; 2u ~= 10u ~ 2u ) { sout | ui; } sout | endl;
+        for ( ui; 10u -~= 2u ~ -2u ) { sout | ui; } sout | endl;
+
         int start = 3, comp = 10, inc = 2;
         for ( i; start ~ comp ~ inc + 1 ) { sout | i; } sout | endl;