Changeset 7030dab for src/AST/Convert.cpp

Timestamp:

Apr 6, 2020, 4:46:28 PM (4 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:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

File:

• src/AST/Convert.cpp (modified) (10 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 : Wed Dec 11 21:39:32 2019
+// Update Count     : 33
 //
 
@@ -245 +245 @@
                 auto decl = new StructDecl(
                         node->name,
-                        node->kind,
+                        (AggregateDecl::Aggregate)node->kind,
                         get<Attribute>().acceptL( node->attributes ),
                         LinkageSpec::Spec( node->linkage.val )
@@ -493 +493 @@
         }
 
+        const ast::Stmt * visit(const ast::SuspendStmt * node ) override final {
+                if ( inCache( node ) ) return nullptr;
+                auto stmt = new SuspendStmt();
+                stmt->then   = get<CompoundStmt>().accept1( node->then   );
+                switch(node->type) {
+                        case ast::SuspendStmt::None     : stmt->type = SuspendStmt::None     ; break;
+                        case ast::SuspendStmt::Coroutine: stmt->type = SuspendStmt::Coroutine; break;
+                        case ast::SuspendStmt::Generator: stmt->type = SuspendStmt::Generator; break;
+                }
+                return stmtPostamble( stmt, node );
+        }
+
         const ast::Stmt * visit( const ast::WaitForStmt * node ) override final {
                 if ( inCache( node ) ) return nullptr;
@@ -686 +698 @@
 
         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(
@@ -1247 +1246 @@
                                 cv( node ),
                                 node->name,
-                                node->kind == ast::TypeVar::Ftype,
+                                node->kind == ast::TypeDecl::Ftype,
                                 get<Attribute>().acceptL( node->attributes )
                         };
@@ -1515 +1514 @@
                         old->location,
                         old->name,
-                        old->kind,
+                        (ast::AggregateDecl::Aggregate)old->kind,
                         GET_ACCEPT_V(attributes, Attribute),
                         { old->linkage.val }
@@ -1602 +1601 @@
                         { old->storageClasses.val },
                         GET_ACCEPT_1(base, Type),
-                        (ast::TypeVar::Kind)(unsigned)old->kind,
+                        (ast::TypeDecl::Kind)(unsigned)old->kind,
                         old->sized,
                         GET_ACCEPT_1(init, Type)
@@ -1883 +1882 @@
         }
 
+        virtual void visit( const SuspendStmt * old ) override final {
+                if ( inCache( old ) ) return;
+                ast::SuspendStmt::Type type;
+                switch (old->type) {
+                        case SuspendStmt::Coroutine: type = ast::SuspendStmt::Coroutine; break;
+                        case SuspendStmt::Generator: type = ast::SuspendStmt::Generator; break;
+                        case SuspendStmt::None     : type = ast::SuspendStmt::None     ; break;
+                        default: abort();
+                }
+                this->node = new ast::SuspendStmt(
+                        old->location,
+                        GET_ACCEPT_1(then  , CompoundStmt),
+                        type,
+                        GET_LABELS_V(old->labels)
+                );
+                cache.emplace( old, this->node );
+        }
+
         virtual void visit( const WaitForStmt * old ) override final {
                 if ( inCache( old ) ) return;
@@ -2056 +2073 @@
         }
 
-        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(
@@ -2599 +2603 @@
                         ty = new ast::TypeInstType{
                                 old->name,
-                                old->isFtype ? ast::TypeVar::Ftype : ast::TypeVar::Dtype,
+                                old->isFtype ? ast::TypeDecl::Ftype : ast::TypeDecl::Dtype,
                                 cv( old ),
                                 GET_ACCEPT_V( attributes, Attribute )