Changeset 1b54b54

Timestamp:

Feb 21, 2019, 10:38:18 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6ca6811

Parents:

2d2df9f

Message:

add decrement to new for control, add tests for it

Files:

• src/Parser/parser.yy (modified) (2 diffs)
• tests/.expect/loopctrl.txt (modified) (2 diffs)
• tests/loopctrl.cfa (modified) (2 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 20 17:53:55 2019
-// Update Count     : 4231
+// Last Modified On : Thu Feb 21 08:45:07 2019
+// Update Count     : 4232
 //
 
@@ -1171 +1171 @@
         | comma_expression ';' comma_expression '~' '@' '~' comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, $7 ); }
+        | comma_expression ';' comma_expression ErangeDown '@' '~' comma_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::GThan, nullptr, $7 ); }
         | comma_expression ';' comma_expression '~' '@' '~' '@' // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, nullptr ); }

tests/.expect/loopctrl.txt

@@ -19 +19 @@
 10 8 6 4 2
 
+2 4 6 8 10
+2.1 3.8 5.5 7.2 8.9
+10 8 6 4 2 0
+12.1 10.4 8.7 7 5.3 3.6
 
 N N N N N N N N N N
@@ -24 +28 @@
 10 9 8 7 6 5 4 3 2 1
 
-
 3 6 9
-
 
 (0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)

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 : Thu Feb 21 08:54:47 2019
+// Update Count     : 86
 // 
 
@@ -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;
 
+        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;