Changes in / [cdc02f2:9507ce3]

Files:

• doc/user/Makefile (modified) (1 diff)
• libcfa/src/iostream.cfa (modified) (2 diffs)
• libcfa/src/iterator.cfa (modified) (2 diffs)
• src/Parser/lex.ll (modified) (2 diffs)
• src/Parser/parser.yy (modified) (9 diffs)
• tests/.expect/forctrl.txt (added)
• tests/.expect/loopctrl.txt (deleted)
• tests/forctrl.c (added)
• tests/loopctrl.c (deleted)

doc/user/Makefile

@@ -79 +79 @@
 ## Define the default recipes.
 
-${Build} :
+${Build}:
         mkdir -p ${Build}
 

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 26 18:22:57 2018
-// Update Count     : 474
+// Last Modified On : Sat Aug 11 13:56:43 2018
+// Update Count     : 473
 //
 
@@ -410 +410 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa iostream.cfa" //
+// compile-command: "cfa iostream.c" //
 // End: //

libcfa/src/iterator.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 26 18:23:10 2018
-// Update Count     : 29
+// Last Modified On : Fri Jul  7 08:38:23 2017
+// Update Count     : 28
 //
 
@@ -33 +33 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa iterator.cfa" //
+// compile-command: "cfa iterator.c" //
 // End: //

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sat Oct 20 09:42:45 2018
- * Update Count     : 687
+ * Last Modified On : Wed Aug 29 15:02:41 2018
+ * Update Count     : 686
  */
 
@@ -209 +209 @@
 __attribute__   { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 auto                    { KEYWORD_RETURN(AUTO); }
-basetypeof              { KEYWORD_RETURN(BASETYPEOF); }                 // CFA
 _Bool                   { KEYWORD_RETURN(BOOL); }                               // C99
 break                   { KEYWORD_RETURN(BREAK); }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 21 08:27:29 2018
-// Update Count     : 4045
+// Last Modified On : Thu Aug 30 17:02:25 2018
+// Update Count     : 4029
 //
 
@@ -186 +186 @@
 } // fieldDecl
 
+ExpressionNode *forInc( const OperKinds op ) {
+        return new ExpressionNode( build_constantInteger( *new string( op == OperKinds::LThan || op == OperKinds::LEThan ? "1" : "-1" ) ) );
+} // forInc
+
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
         ConstantExpr *constant = dynamic_cast<ConstantExpr *>(type->get_expr());
@@ -194 +198 @@
                 distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
                 new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
-                new ExpressionNode( build_binary_val( compop == OperKinds::LThan || compop == OperKinds::LEThan ? // choose += or -= for upto/downto
-                                                                                          OperKinds::PlusAssn : OperKinds::MinusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
+                new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
 } // forCtrl
 
@@ -258 +261 @@
 %token ZERO_T ONE_T                                                                             // CFA
 %token VALIST                                                                                   // GCC
-%token TYPEOF BASETYPEOF LABEL                                                  // GCC
+%token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
 %token EXCEPTION                                                                                // CFA
@@ -633 +636 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
+                {
+                        $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
+                }
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
@@ -1141 +1146 @@
                         } else {
                                 $$ = 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" ) ) ) );
+                                                          OperKinds::LThan, $1->clone(), forInc( OperKinds::LThan ) );
                         } // if
                 }
         | constant_expression inclexcl constant_expression      // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, forInc( $2 ) ); }
         | constant_expression inclexcl constant_expression '~' constant_expression // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
@@ -1157 +1162 @@
                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
                                         $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
-                                                                  OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                                                  OperKinds::LThan, $3->clone(), forInc( OperKinds::LThan ) );
                                 } else {
                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
@@ -1169 +1174 @@
                         } else {
                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, forInc( $4 ) );
                                 } else {
                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
@@ -1854 +1859 @@
         | TYPEOF '(' comma_expression ')'                                       // GCC: typeof(a+b) y;
                 { $$ = DeclarationNode::newTypeof( $3 ); }
-        | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof(x) y;
-                { $$ = $3; }
-        | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof(a+b) y;
-                { $$ = DeclarationNode::newTypeof( $3 ); }
         | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type(x) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }