Changeset 561354f for src/Common

Timestamp:

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

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

d6c464d

Parents:

28f8f15

Message:

Save progress

Location:

src/Common

Files:

• CodeLocationTools.cpp (modified) (1 diff)
• PassVisitor.h (modified) (3 diffs)
• PassVisitor.impl.h (modified) (2 diffs)
• PassVisitor.proto.h (modified) (1 diff)

src/Common/CodeLocationTools.cpp

@@ -105 +105 @@
     macro(UnionDecl, Decl) \
     macro(EnumDecl, Decl) \
+        macro(AdtDecl, Decl) \
     macro(TraitDecl, Decl) \
     macro(TypeDecl, Decl) \

src/Common/PassVisitor.h

@@ -69 +69 @@
         virtual void visit( EnumDecl * aggregateDecl ) override final;
         virtual void visit( const EnumDecl * aggregateDecl ) override final;
+        virtual void visit( AdtDecl * aggregateDecl ) override final;
+        virtual void visit( const AdtDecl * AggregateDecl ) override final;
         virtual void visit( TraitDecl * aggregateDecl ) override final;
         virtual void visit( const TraitDecl * aggregateDecl ) override final;
@@ -269 +271 @@
         virtual Declaration * mutate( UnionDecl * aggregateDecl ) override final;
         virtual Declaration * mutate( EnumDecl * aggregateDecl ) override final;
+        virtual Declaration * mutate( AdtDecl * aggregateDecl ) override final;
         virtual Declaration * mutate( TraitDecl * aggregateDecl ) override final;
         virtual Declaration * mutate( TypeDecl * typeDecl ) override final;
@@ -439 +442 @@
         void indexerAddStructFwd( const StructDecl          * node  ) { indexer_impl_addStructFwd( pass, 0, node ); }
         void indexerAddEnum     ( const EnumDecl            * node  ) { indexer_impl_addEnum     ( pass, 0, node ); }
+        void indexerAddAdt              ( const AdtDecl                         * node  ) { indexer_impl_addAdt          ( pass, 0, node ); }
         void indexerAddUnion    ( const std::string         & id    ) { indexer_impl_addUnion    ( pass, 0, id   ); }
         void indexerAddUnion    ( const UnionDecl           * node  ) { indexer_impl_addUnion    ( pass, 0, node ); }

src/Common/PassVisitor.impl.h

@@ -754 +754 @@
 
         // unlike structs, traits, and unions, enums inject their members into the global scope
-        maybeAccept_impl( node->data_constructors, *this );
-        maybeAccept_impl( node->data_union, *this );
-        maybeAccept_impl( node->tags, *this );
         maybeAccept_impl( node->parameters, *this );
         maybeAccept_impl( node->members   , *this );
@@ -785 +782 @@
 
         // unlike structs, traits, and unions, enums inject their members into the global scope
+        maybeMutate_impl( node->parameters, *this );
+        maybeMutate_impl( node->members   , *this );
+        maybeMutate_impl( node->attributes, *this );
+
+        MUTATE_END( Declaration, node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( AdtDecl * node ) {
+        VISIT_START( node );
+
+        indexerAddAdt( node );
+
+        // unlike structs, traits, and unions, enums inject their members into the global scope
+        maybeAccept_impl( node->data_constructors, *this );
+        maybeAccept_impl( node->data_union, *this );
+        maybeAccept_impl( node->tag, *this );
+
+        maybeAccept_impl( node->parameters, *this );
+        maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const AdtDecl * node ) {
+        VISIT_START( node );
+
+        maybeAccept_impl( node->data_constructors, *this );
+        maybeAccept_impl( node->data_union, *this );
+        maybeAccept_impl( node->tag, *this );
+
+        maybeAccept_impl( node->parameters, *this );
+        maybeAccept_impl( node->members   , *this );
+        maybeAccept_impl( node->attributes, *this );
+
+
+        VISIT_END( node );
+}  
+
+template< typename pass_type >
+Declaration * PassVisitor< pass_type >::mutate( AdtDecl * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->data_constructors, *this );
+        maybeMutate_impl( node->data_union, *this );
+        maybeMutate_impl( node->tag, *this );
+
         maybeMutate_impl( node->parameters, *this );
         maybeMutate_impl( node->members   , *this );

src/Common/PassVisitor.proto.h

@@ -233 +233 @@
 INDEXER_FUNC1( addStruct , const StructDecl *                );
 INDEXER_FUNC1( addEnum   , const EnumDecl *                  );
+INDEXER_FUNC1( addAdt    , const AdtDecl *                                       );
 INDEXER_FUNC1( addUnion  , const UnionDecl *                 );
 INDEXER_FUNC1( addTrait  , const TraitDecl *                 );