Changeset f80f840 for src/Parser/parser.yy

Timestamp:

Dec 10, 2019, 4:24:49 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2a3d446

Parents:

b798713 (diff), e307e12 (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 relaxed_ready

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 Aug  4 21:48:23 2019
-// Update Count     : 4364
+// Last Modified On : Sat Dec  7 10:43:44 2019
+// Update Count     : 4394
 //
 
@@ -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 ?
@@ -365 +376 @@
 %type<decl> abstract_parameter_declaration
 
-%type<aggKey> aggregate_key
+%type<aggKey> aggregate_key aggregate_data aggregate_control
 %type<decl> aggregate_type aggregate_type_nobody
 
@@ -650 +661 @@
         | 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 ) ) ); }
@@ -793 +806 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-                // 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 ) ); }
+        | '(' aggregate_control '&' ')' cast_expression         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( Aggregate2Target( $2 ), $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression                                       // CFA
@@ -2059 +2065 @@
 
 aggregate_key:
+        aggregate_data
+        | aggregate_control
+        ;
+
+aggregate_data:
         STRUCT
                 { yyy = true; $$ = DeclarationNode::Struct; }
         | UNION
                 { yyy = true; $$ = DeclarationNode::Union; }
-        | EXCEPTION
+        | EXCEPTION                                                                                     // CFA
                 { yyy = true; $$ = DeclarationNode::Exception; }
-        | GENERATOR
+        ;
+
+aggregate_control:                                                                              // CFA
+        GENERATOR
                 { yyy = true; $$ = DeclarationNode::Coroutine; }
         | COROUTINE
@@ -2096 +2110 @@
                         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