Changes in src/AST/Convert.cpp [665f432:312029a]

File:

• src/AST/Convert.cpp (modified) (5 diffs)

src/AST/Convert.cpp

@@ -10 +10 @@
 // Created On       : Thu May 09 15::37::05 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 25 22:21:46 2019
-// Update Count     : 13
+// Last Modified On : Tue Dec 10 22:20:10 2019
+// Update Count     : 32
 //
 
@@ -245 +245 @@
                 auto decl = new StructDecl(
                         node->name,
-                        node->kind,
+                        (AggregateDecl::Aggregate)node->kind,
                         get<Attribute>().acceptL( node->attributes ),
                         LinkageSpec::Spec( node->linkage.val )
@@ -675 +675 @@
 
         const ast::Expr * visit( const ast::KeywordCastExpr * node ) override final {
-                KeywordCastExpr::Target castTarget = KeywordCastExpr::NUMBER_OF_TARGETS;
-                switch (node->target) {
-                        case ast::KeywordCastExpr::Coroutine:
-                                castTarget = KeywordCastExpr::Coroutine;
-                                break;
-                        case ast::KeywordCastExpr::Thread:
-                                castTarget = KeywordCastExpr::Thread;
-                                break;
-                        case ast::KeywordCastExpr::Monitor:
-                                castTarget = KeywordCastExpr::Monitor;
-                                break;
-                        default:
-                                break;
-                }
-                assert ( castTarget < KeywordCastExpr::NUMBER_OF_TARGETS );
+                AggregateDecl::Aggregate castTarget = (AggregateDecl::Aggregate)node->target;
+                assert( AggregateDecl::Generator <= castTarget && castTarget <= AggregateDecl::Thread );
                 auto expr = visitBaseExpr( node,
                         new KeywordCastExpr(
@@ -1504 +1491 @@
                         old->location,
                         old->name,
-                        old->kind,
+                        (ast::AggregateDecl::Aggregate)old->kind,
                         GET_ACCEPT_V(attributes, Attribute),
                         { old->linkage.val }
@@ -2045 +2032 @@
         }
 
-        virtual void visit( const KeywordCastExpr * old) override final {
-                ast::KeywordCastExpr::Target castTarget = ast::KeywordCastExpr::NUMBER_OF_TARGETS;
-                switch (old->target) {
-                        case KeywordCastExpr::Coroutine:
-                                castTarget = ast::KeywordCastExpr::Coroutine;
-                                break;
-                        case KeywordCastExpr::Thread:
-                                castTarget = ast::KeywordCastExpr::Thread;
-                                break;
-                        case KeywordCastExpr::Monitor:
-                                castTarget = ast::KeywordCastExpr::Monitor;
-                                break;
-                        default:
-                                break;
-                }
-                assert ( castTarget < ast::KeywordCastExpr::NUMBER_OF_TARGETS );
+        virtual void visit( const KeywordCastExpr * old ) override final {
+                ast::AggregateDecl::Aggregate castTarget = (ast::AggregateDecl::Aggregate)old->target;
+                assert( ast::AggregateDecl::Generator <= castTarget && castTarget <= ast::AggregateDecl::Thread );
                 this->node = visitBaseExpr( old,
                         new ast::KeywordCastExpr(