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

File:

• src/Parser/parser.yy (modified) (9 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 : Thu Dec 12 17:54:22 2019
-// Update Count     : 4404
+// Last Modified On : Sat Dec  7 10:43:44 2019
+// Update Count     : 4394
 //
 
@@ -51 +51 @@
 using namespace std;
 
-#include "SynTree/Declaration.h"
 #include "ParseNode.h"
 #include "TypedefTable.h"
@@ -212 +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 ?
 
@@ -237 +248 @@
         ExpressionNode * en;
         DeclarationNode * decl;
-        AggregateDecl::Aggregate aggKey;
+        DeclarationNode::Aggregate aggKey;
         DeclarationNode::TypeClass tclass;
         StatementNode * sn;
@@ -651 +662 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression '.' aggregate_control
-                { $$ = new ExpressionNode( build_keyword_cast( $3, $1 ) ); }
+                { $$ = new ExpressionNode( build_keyword_cast( Aggregate2Target( $3 ), $1 ) ); }
         | postfix_expression ARROW identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
@@ -796 +807 @@
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
         | '(' aggregate_control '&' ')' cast_expression         // CFA
-                { $$ = new ExpressionNode( build_keyword_cast( $2, $5 ) ); }
+                { $$ = new ExpressionNode( build_keyword_cast( Aggregate2Target( $2 ), $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression                                       // CFA
@@ -1190 +1201 @@
                 { $$ = 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" ) ) ) ); }
-        | '=' comma_expression                                                                  // CFA
-                { $$ = forCtrl( $2, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
-                                                OperKinds::LEThan, $2->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | comma_expression inclexcl comma_expression            // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
@@ -1200 +1208 @@
                 { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' '=' comma_expression                             // CFA
-                { $$ = forCtrl( $4, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
-                                                OperKinds::LEThan, $4->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
         | comma_expression ';' comma_expression inclexcl comma_expression // CFA
                 { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
@@ -2066 +2071 @@
 aggregate_data:
         STRUCT
-                { yyy = true; $$ = AggregateDecl::Struct; }
+                { yyy = true; $$ = DeclarationNode::Struct; }
         | UNION
-                { yyy = true; $$ = AggregateDecl::Union; }
+                { yyy = true; $$ = DeclarationNode::Union; }
         | EXCEPTION                                                                                     // CFA
-                { yyy = true; $$ = AggregateDecl::Exception; }
+                { yyy = true; $$ = DeclarationNode::Exception; }
         ;
 
 aggregate_control:                                                                              // CFA
         GENERATOR
-                { yyy = true; $$ = AggregateDecl::Coroutine; }
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | COROUTINE
-                { yyy = true; $$ = AggregateDecl::Coroutine; }
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | MONITOR
-                { yyy = true; $$ = AggregateDecl::Monitor; }
+                { yyy = true; $$ = DeclarationNode::Monitor; }
         | THREAD
-                { yyy = true; $$ = AggregateDecl::Thread; }
+                { yyy = true; $$ = DeclarationNode::Thread; }
         ;