Changeset 561354f for src/AST/Convert.cpp

Timestamp:

May 17, 2023, 1:33:39 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

d6c464d

Parents:

28f8f15

Message:

Save progress

File:

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

src/AST/Convert.cpp

@@ -283 +283 @@
                 decl->parent = get<AggregateDecl>().accept1( node->parent );
                 declPostamble( decl, node );
-                return nullptr; // ??
+                return nullptr;
         }
 
@@ -321 +321 @@
                         get<Type>().accept1(node->base)
                 );
-                decl->data_constructors = get<StructDecl>().acceptL( node->data_constructors );
-                decl->data_union = get<UnionDecl>().accept1( node->data_union );
-                decl->tags = get<EnumDecl>().accept1( node->tag );
-                decl->tag_union = get<StructDecl>().accept1( node->tag_union );
+                // decl->data_constructors = get<StructDecl>().acceptL( node->data_constructors );
+                // decl->data_union = get<UnionDecl>().accept1( node->data_union );
+                // decl->tag = get<EnumDecl>().accept1( node->tag );
+                // decl->tag_union = get<StructDecl>().accept1( node->tag_union );
+                return aggregatePostamble( decl, node );
+        }
+
+        const ast::Decl * visit( const ast::AdtDecl * node ) override final {
+                if ( inCache(node) ) return nullptr;
+                auto decl = new AdtDecl(
+                        node->name,
+                        get<Attribute>().acceptL( node->attributes ),
+                        LinkageSpec::Spec( node->linkage.val ),
+                        get<StructDecl>().acceptL( node->data_constructors ),
+                        get<UnionDecl>().accept1( node->data_union ),
+                        get<EnumDecl>().accept1( node->tag ),
+                        get<StructDecl>().accept1( node->tag_union )
+                );
                 return aggregatePostamble( decl, node );
         }
@@ -1782 +1796 @@
         }
 
+        virtual void visit( const AdtDecl * old ) override final {
+                if ( inCache( old ) ) return;
+                auto decl = new ast::AdtDecl(
+                        old->location,
+                        old->name,
+                        GET_ACCEPT_V(attributes, Attribute),
+                        { old->linkage.val }
+                );
+                cache.emplace( old, decl );
+                decl->parent = GET_ACCEPT_1(parent, AggregateDecl);
+                decl->body = old->body;
+                decl->params = GET_ACCEPT_V(parameters, TypeDecl);
+                decl->members = GET_ACCEPT_V(members, Decl);
+                decl->extension = old->extension;
+                decl->uniqueId = old->uniqueId;
+                decl->storage = { old->storageClasses.val };
+                decl->data_constructors = GET_ACCEPT_V( data_constructors, StructDecl );
+                decl->data_union = GET_ACCEPT_1( data_union, UnionDecl );
+                decl->tag = GET_ACCEPT_1( tag, EnumDecl );
+                decl->tag_union = GET_ACCEPT_1( tag_union, StructDecl );
+                this->node = decl;
+        }
+
         virtual void visit( const TraitDecl * old ) override final {
                 if ( inCache( old ) ) return;