Changeset f4e01f1

Timestamp:

May 17, 2023, 4:27:25 PM (18 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

3a513d89

Parents:

d6c464d

Message:

Save progress

Location:

src

Files:

• AST/Pass.proto.hpp (modified) (1 diff)
• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• Common/PassVisitor.h (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (3 diffs)
• Common/PassVisitor.proto.h (modified) (1 diff)

src/AST/Pass.proto.hpp

@@ -430 +430 @@
 
         template<typename core_t>
+        static inline auto addAdtFwd( core_t & core, int, const ast::AdtDecl * decl ) -> decltype( core.symtab.addAdt( decl ), void() ) {
+                ast::AdtDecl * fwd = new ast::AdtDecl( decl->location, decl->name );
+                for ( const auto & param : decl->params ) {
+                        fwd->params.push_back( deepCopy( param.get() ) );
+                }
+                // Experimental
+                for ( const auto & ctor : decl->data_constructors ) {
+                        addStructFwd( core, 0, ctor  );
+                } 
+                core.symtab.addAdt( fwd );
+        }
+
+        template<typename core_t>
+        static inline auto addAdtFwd( core_t &, long, const ast::AdtDecl) {}
+
+        template<typename core_t>
         static inline auto addStruct( core_t & core, int, const std::string & str ) -> decltype( core.symtab.addStruct( str ), void() ) {
                 if ( ! core.symtab.lookupStruct( str ) ) {

src/CodeGen/CodeGenerator.cc

@@ -295 +295 @@
         }
 
-        void CodeGenerator::handleData( EnumDecl * dataDecl ) {
+        void CodeGenerator::handleData( EnumDecl * ) {
                 // output << " /** data type */" << endl;
                 // for ( StructDecl * decl : dataDecl->data_constructors ) {
@@ -348 +348 @@
                         } // if
                 } // if
+        }
+
+        void CodeGenerator::postvisit( AdtDecl * ) {
+                // TODO
         }
 

src/CodeGen/CodeGenerator.h

@@ -53 +53 @@
                 void postvisit( UnionDecl * aggregateDecl );
                 void postvisit( EnumDecl * aggregateDecl );
+                void postvisit( AdtDecl * AggregateDecl );
                 void postvisit( TraitDecl * aggregateDecl );
                 void postvisit( TypedefDecl * typeDecl );

src/Common/PassVisitor.h

@@ -443 +443 @@
         void indexerAddEnum     ( const EnumDecl            * node  ) { indexer_impl_addEnum     ( pass, 0, node ); }
         void indexerAddAdt              ( const AdtDecl                         * node  ) { indexer_impl_addAdt          ( pass, 0, node ); }
+        void indexerAddAdtFwd   ( const AdtDecl                         * node  ) { indexer_impl_addAdtFwd   ( 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

@@ -793 +793 @@
         VISIT_START( node );
 
-        indexerAddAdt( node );
+        indexerAddAdtFwd( node );
 
         // unlike structs, traits, and unions, enums inject their members into the global scope
@@ -811 +811 @@
         VISIT_START( node );
 
+        indexerAddAdtFwd( node );
+
         maybeAccept_impl( node->data_constructors, *this );
         maybeAccept_impl( node->data_union, *this );
@@ -826 +828 @@
 Declaration * PassVisitor< pass_type >::mutate( AdtDecl * node ) {
         MUTATE_START( node );
+        
+        indexerAddAdtFwd( node );
 
         maybeMutate_impl( node->data_constructors, *this );

src/Common/PassVisitor.proto.h

@@ -252 +252 @@
 
 template<typename pass_type>
+static inline auto indexer_impl_addAdtFwd( pass_type & pass, int, const AdtDecl * decl ) -> decltype( pass.indexer.addAdt( decl ), void() ) {
+        AdtDecl * fwd = new AdtDecl( decl->name );
+        cloneAll( decl->parameters, fwd->parameters );
+
+        // Experimental
+        for ( const StructDecl * ctor : fwd->data_constructors ) {
+                indexer_impl_addStructFwd( pass, 0, ctor );
+        }
+
+        pass.indexer.addAdt( fwd );
+} 
+
+template<typename pass_type>
+static inline auto indexer_impl_addAdtFwd( pass_type &, long, const AdtDecl * ) {}
+
+template<typename pass_type>
 static inline auto indexer_impl_addUnionFwd( pass_type & pass, int, const UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
         UnionDecl * fwd = new UnionDecl( decl->name );