Changeset 3d5701e for src/AST/Convert.cpp

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

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 )
@@ -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(
@@ -887 +874 @@
                 auto expr = visitBaseExpr( node,
                         new AsmExpr(
-                                get<Expression>().accept1(node->inout),
+                                new std::string(node->inout),
                                 get<Expression>().accept1(node->constraint),
                                 get<Expression>().accept1(node->operand)
@@ -1236 +1223 @@
                                 cv( node ),
                                 node->name,
-                                node->kind == ast::TypeVar::Ftype,
+                                node->kind == ast::TypeDecl::Ftype,
                                 get<Attribute>().acceptL( node->attributes )
                         };
@@ -1504 +1491 @@
                         old->location,
                         old->name,
-                        old->kind,
+                        (ast::AggregateDecl::Aggregate)old->kind,
                         GET_ACCEPT_V(attributes, Attribute),
                         { old->linkage.val }
@@ -1591 +1578 @@
                         { 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)
@@ -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(
@@ -2258 +2232 @@
                         new ast::AsmExpr(
                                 old->location,
-                                GET_ACCEPT_1(inout, Expr),
+                                old->inout,
                                 GET_ACCEPT_1(constraint, Expr),
                                 GET_ACCEPT_1(operand, Expr)
@@ -2587 +2561 @@
                         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 )