Changes in src/Parser/parser.yy [1dda8de:1b54b54]

File:

• src/Parser/parser.yy (modified) (10 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 : Mon Apr 15 15:02:56 2019
-// Update Count     : 4290
+// Last Modified On : Thu Feb 21 08:45:07 2019
+// Update Count     : 4232
 //
 
@@ -185 +185 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        ConstantExpr * constant = dynamic_cast<ConstantExpr *>(type->expr.get());
+        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 ) ) );
@@ -198 +198 @@
 
 ForCtrl * forCtrl( ExpressionNode * type, ExpressionNode * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->expr.get()) ) {
+        if ( NameExpr * identifier = dynamic_cast<NameExpr *>(index->get_expr()) ) {
                 return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
-        } else if ( CommaExpr * commaExpr = dynamic_cast<CommaExpr *>(index->expr.get()) ) {
+        } else if ( CommaExpr * commaExpr = dynamic_cast<CommaExpr *>(index->get_expr()) ) {
                 if ( NameExpr * identifier = dynamic_cast<NameExpr *>(commaExpr->arg1 ) ) {
                         return forCtrl( type, new string( identifier->name ), start, compop, comp, inc );
@@ -265 +265 @@
 %token RESTRICT                                                                                 // C99
 %token ATOMIC                                                                                   // C11
-%token FORALL MUTEX VIRTUAL COERCE                                              // CFA
+%token FORALL MUTEX VIRTUAL                                                             // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token BOOL COMPLEX IMAGINARY                                                   // C99
@@ -334 +334 @@
 %type<en> subrange
 %type<decl> asm_name_opt
-%type<en> asm_operands_opt                              asm_operands_list                       asm_operand
+%type<en> asm_operands_opt asm_operands_list asm_operand
 %type<label> label_list
 %type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
-%type<genexpr> generic_association              generic_assoc_list
+%type<genexpr> generic_association generic_assoc_list
 
 // statements
@@ -795 +795 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-                // keyword cast cannot be grouped because of reduction in aggregate_key
         | '(' COROUTINE '&' ')' cast_expression                         // CFA
                 { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
@@ -807 +806 @@
         | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
-        | '(' RETURN type_no_function ')' cast_expression       // CFA
-                { SemanticError( yylloc, "Return cast is currently unimplemented." ); $$ = nullptr; }
-        | '(' COERCE type_no_function ')' cast_expression       // CFA
-                { SemanticError( yylloc, "Coerce cast is currently unimplemented." ); $$ = nullptr; }
-        | '(' qualifier_cast_list ')' cast_expression           // CFA
-                { SemanticError( yylloc, "Qualifier cast is currently unimplemented." ); $$ = nullptr; }
 //      | '(' type_no_function ')' tuple
 //              { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-        ;
-
-qualifier_cast_list:
-        cast_modifier type_qualifier_name
-        | cast_modifier MUTEX
-        | qualifier_cast_list cast_modifier type_qualifier_name
-        | qualifier_cast_list cast_modifier MUTEX
-        ;
-
-cast_modifier:
-        '-'
-        | '+'
         ;
 
@@ -1164 +1145 @@
         for_control_expression
         | for_control_expression_list ':' for_control_expression
-                // ForCtrl + ForCtrl:
-                //    init + init => multiple declaration statements that are hoisted
-                //    condition + condition => (expression) && (expression)
-                //    change + change => (expression), (expression)
-                {
-                        $1->init->set_last( $3->init );
-                        if ( $1->condition ) {
-                                if ( $3->condition ) {
-                                        $1->condition->expr.reset( new LogicalExpr( $1->condition->expr.release(), $3->condition->expr.release(), true ) );
-                                } // if
-                        } else $1->condition = $3->condition;
-                        if ( $1->change ) {
-                                if ( $3->change ) {
-                                        $1->change->expr.reset( new CommaExpr( $1->change->expr.release(), $3->change->expr.release() ) );
-                                } // if
-                        } else $1->change = $3->change;
-                        $$ = $1;
-                }
+                { $$ = $3; }
         ;
 
@@ -1191 +1155 @@
         | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
                 { $$ = new ForCtrl( $1, $2, $4 ); }
-
         | comma_expression                                                                      // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
@@ -1206 +1169 @@
         | comma_expression ';' comma_expression inclexcl comma_expression '~' comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
-
-                // There is a S/R conflicit if ~ and -~ are factored out.
-        | comma_expression ';' comma_expression '~' '@'         // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' comma_expression ErangeDown '@' // CFA
-                { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::GThan, nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | comma_expression ';' comma_expression '~' '@' '~' comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), OperKinds::LThan, nullptr, $7 ); }