Changeset 0982a05

Timestamp:

Aug 30, 2018, 6:30:10 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

7e08acf, a9fb796, e255e69d

Parents:

933933c

Message:

fix 0 and 1 for new for-control

Files:

• src/Parser/parser.yy (modified) (3 diffs)
• tests/.expect/forctrl.txt (modified) (2 diffs)
• tests/forctrl.c (modified) (3 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 Aug 29 16:44:17 2018
-// Update Count     : 4006
+// Last Modified On : Thu Aug 30 17:02:25 2018
+// Update Count     : 4029
 //
 
@@ -191 +191 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        ConstantExpr *constant = dynamic_cast<ConstantExpr *>(type->get_expr());
+        if ( constant && (constant->get_constant()->get_value() == "0" || constant->get_constant()->get_value() == "1") ) {
+        type = new ExpressionNode( new CastExpr( maybeMoveBuild< Expression >(type), new BasicType( Type::Qualifiers(), BasicType::SignedInt ) ) );
+        } // if
         return new ForCtrl(
                 distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
@@ -218 +222 @@
 
 // Types declaration for productions
-%union
-{
+%union {
         Token tok;
         ParseNode * pn;

tests/.expect/forctrl.txt

@@ -2 +2 @@
 empty
 empty
+
+A
+A A
 A A A A A A A A A A
 B B B B B
@@ -9 +12 @@
 0 1 2 3 4 5 6 7 8 9
 0 1 2 3 4 5 6 7 8 9
-2 4 6 8 10
+1 3 5 7 9
 10 8 6 4 2
 0.5 1.5 2.5 3.5 4.5

tests/forctrl.c

@@ -10 +10 @@
 // Created On       : Wed Aug  8 18:32:59 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 29 18:04:15 2018
-// Update Count     : 26
+// Last Modified On : Thu Aug 30 17:12:12 2018
+// Update Count     : 43
 // 
 
@@ -34 +34 @@
         for () { sout | "empty"; break; }               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 ( 2 ~= 10 ~ 2 ) { sout | "B"; }             sout | endl;
-        for ( 10 -~= 2 ~ -2 ) { sout | "C"; }   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;
@@ -44 +47 @@
         for ( j; 10 ) { sout | j; }                             sout | endl;
 
-        //for ( i; 1 ~= 10 ~ 2 ) { sout | i; }  sout | endl;
-        for ( i; 2 ~= 10 ~ 2 ) { sout | i; }    sout | endl;
-        for ( i; 10 -~= 2 ~ -2 ) { sout | i; }  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; 5.5 -~ 0.5 ) { sout | i; }             sout | endl;