Changeset 9853d9b0

Timestamp:

Dec 12, 2019, 6:21:09 PM (5 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:

0f4527d, 1469a8a

Parents:

332bd33

Message:

missed a case for inclusive bound to singleton comparison, and added tests

Files:

• src/Parser/parser.yy (modified) (2 diffs)
• tests/.expect/loopctrl.txt (modified) (3 diffs)
• tests/loopctrl.cfa (modified) (4 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 : Thu Dec 12 17:42:08 2019
-// Update Count     : 4401
+// Last Modified On : Thu Dec 12 17:54:22 2019
+// Update Count     : 4404
 //
 
@@ -1190 +1190 @@
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | '=' comma_expression                                                                  // CFA
+                { $$ = forCtrl( $2, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
+                                                OperKinds::LEThan, $2->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | comma_expression inclexcl comma_expression            // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }

tests/.expect/loopctrl.txt

@@ -6 +6 @@
 A
 A A A A A A A A A A
+A A A A A A A A A A A
 B B B B B
 C C C C C
@@ -12 +13 @@
 
 0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
 1 3 5 7 9
 10 8 6 4 2
@@ -28 +30 @@
 N N N N N N N N N N
 0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
 10 9 8 7 6 5 4 3 2 1
 

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;