Changes in src/Parser/parser.yy [e307e12:f1da02c]

File:

• src/Parser/parser.yy (modified) (8 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 : Sat Dec  7 10:43:44 2019
-// Update Count     : 4394
+// Last Modified On : Sun Aug  4 21:48:23 2019
+// Update Count     : 4364
 //
 
@@ -211 +211 @@
 } // forCtrl
 
-KeywordCastExpr::Target Aggregate2Target( DeclarationNode::Aggregate aggr ) {
-        KeywordCastExpr::Target target;
-        switch ( aggr ) {
-          case DeclarationNode::Coroutine: target = KeywordCastExpr::Coroutine; break;
-          case DeclarationNode::Monitor: target = KeywordCastExpr::Monitor; break;
-          case DeclarationNode::Thread: target = KeywordCastExpr::Thread; break;
-          default: abort();
-        } // switch
-        return target;
-} // Aggregate2Target
-
 
 bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
@@ -376 +365 @@
 %type<decl> abstract_parameter_declaration
 
-%type<aggKey> aggregate_key aggregate_data aggregate_control
+%type<aggKey> aggregate_key
 %type<decl> aggregate_type aggregate_type_nobody
 
@@ -661 +650 @@
         | postfix_expression '.' '[' field_name_list ']'        // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
-        | postfix_expression '.' aggregate_control
-                { $$ = new ExpressionNode( build_keyword_cast( Aggregate2Target( $3 ), $1 ) ); }
         | postfix_expression ARROW identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
@@ -806 +793 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-        | '(' aggregate_control '&' ')' cast_expression         // CFA
-                { $$ = new ExpressionNode( build_keyword_cast( Aggregate2Target( $2 ), $5 ) ); }
+                // keyword cast cannot be grouped because of reduction in aggregate_key
+        | '(' GENERATOR '&' ')' cast_expression                         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
+        | '(' COROUTINE '&' ')' cast_expression                         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
+        | '(' THREAD '&' ')' cast_expression                            // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Thread, $5 ) ); }
+        | '(' MONITOR '&' ')' cast_expression                           // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Monitor, $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression                                       // CFA
@@ -1429 +1423 @@
 asm_operand:                                                                                    // GCC
         string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( new AsmExpr( nullptr, $1, maybeMoveBuild< Expression >( $3 ) ) ); }
-        | '[' IDENTIFIER ']' string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( new AsmExpr( $2, $4, maybeMoveBuild< Expression >( $6 ) ) ); }
+                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ), $1, maybeMoveBuild< Expression >( $3 ) ) ); }
+        | '[' constant_expression ']' string_literal '(' constant_expression ')'
+                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( $2 ), $4, maybeMoveBuild< Expression >( $6 ) ) ); }
         ;
 
@@ -2065 +2059 @@
 
 aggregate_key:
-        aggregate_data
-        | aggregate_control
-        ;
-
-aggregate_data:
         STRUCT
                 { yyy = true; $$ = DeclarationNode::Struct; }
         | UNION
                 { yyy = true; $$ = DeclarationNode::Union; }
-        | EXCEPTION                                                                                     // CFA
+        | EXCEPTION
                 { yyy = true; $$ = DeclarationNode::Exception; }
-        ;
-
-aggregate_control:                                                                              // CFA
-        GENERATOR
+        | GENERATOR
                 { yyy = true; $$ = DeclarationNode::Coroutine; }
         | COROUTINE
@@ -2110 +2096 @@
                         distInl( $3 );
                 }
-        | INLINE aggregate_control ';'                                          // CFA
-                { SemanticError( yylloc, "INLINE aggregate control currently unimplemented." ); $$ = nullptr; }
         | typedef_declaration ';'                                                       // CFA
         | cfa_field_declaring_list ';'                                          // CFA, new style field declaration