Changeset 515a037 for src/Parser/parser.yy

Timestamp:

Dec 12, 2018, 3:52:19 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1b8f13f0

Parents:

cdc02f2 (diff), 85acec94 (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' into shared_library

File:

• src/Parser/parser.yy (modified) (7 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 : Sun Oct 21 08:27:29 2018
-// Update Count     : 4045
+// Last Modified On : Thu Nov  8 18:08:23 2018
+// Update Count     : 4052
 //
 
@@ -187 +187 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        ConstantExpr *constant = dynamic_cast<ConstantExpr *>(type->get_expr());
+        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 ) ) ),
+                distAttr( DeclarationNode::newTypeof( type, true ), 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 ) ) );
+<<<<<<< HEAD
+=======
+} // forCtrl
+
+ForCtrl * forCtrl( ExpressionNode * type, ExpressionNode * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->get_expr()) ) {
+                return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
+        } else {
+                SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); return nullptr;
+        } // if
+>>>>>>> master
 } // forCtrl
 
@@ -1132 +1143 @@
         | FOR '(' push for_control_expression ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
+        | FOR '(' ')' statement                                                         // CFA => for ( ;; )
+                { $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), $4 ) ); }
         ;
 
 for_control_expression:
+<<<<<<< HEAD
         comma_expression_opt                                                            // CFA
                 {
@@ -1144 +1158 @@
                         } // if
                 }
+=======
+        comma_expression                                                                        // CFA
+                { $$ = 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" ) ) ) ); }
+>>>>>>> master
         | constant_expression inclexcl constant_expression      // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | constant_expression inclexcl constant_expression '~' constant_expression // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
+<<<<<<< HEAD
         | comma_expression_opt ';' comma_expression                     // CFA
                 {
@@ -1188 +1208 @@
                 }
         | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
+=======
+        | comma_expression ';' comma_expression                         // CFA
+                { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
+                                                OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' constant_expression inclexcl constant_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | comma_expression ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
+        | comma_expression ';' comma_expression_opt ';' comma_expression_opt
+>>>>>>> master
                 { $$ = new ForCtrl( $1, $3, $5 ); }
+        | ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtrl( (ExpressionNode * )nullptr, $2, $4 ); }
         | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
                 { $$ = new ForCtrl( $1, $2, $4 ); }
@@ -1850 +1882 @@
 
 indirect_type:
-        TYPEOF '(' type ')'                                                                     // GCC: typeof(x) y;
+        TYPEOF '(' type ')'                                                                     // GCC: typeof( x ) y;
                 { $$ = $3; }
-        | TYPEOF '(' comma_expression ')'                                       // GCC: typeof(a+b) y;
+        | TYPEOF '(' comma_expression ')'                                       // GCC: typeof( a+b ) y;
                 { $$ = DeclarationNode::newTypeof( $3 ); }
+<<<<<<< HEAD
         | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof(x) y;
                 { $$ = $3; }
@@ -1859 +1892 @@
                 { $$ = DeclarationNode::newTypeof( $3 ); }
         | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type(x) y;
+=======
+        | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof( x ) y;
+                { $$ = DeclarationNode::newTypeof( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ), true ); }
+        | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof( a+b ) y;
+                { $$ = DeclarationNode::newTypeof( $3, true ); }
+        | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type( x ) y;
+>>>>>>> master
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
-        | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
+        | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type( a+b ) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
         | ZERO_T                                                                                        // CFA