Changeset fa2c005 for src/Validate

Timestamp:

Jun 8, 2023, 3:19:43 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Parents:

044ae62

Message:

Finish Adt POC

Location:

src/Validate

Files:

• EliminateTypedef.cpp (modified) (2 diffs)
• FixQualifiedTypes.cpp (modified) (1 diff)
• HoistStruct.cpp (modified) (4 diffs)
• HoistStruct.hpp (modified) (1 diff)
• LinkReferenceToTypes.cpp (modified) (3 diffs)
• NoIdSymbolTable.hpp (modified) (2 diffs)
• ReplaceTypedef.cpp (modified) (4 diffs)

src/Validate/EliminateTypedef.cpp

@@ -31 +31 @@
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
         ast::UnionDecl const * previsit( ast::UnionDecl const * decl );
+        ast::AdtDecl const * previsit( ast::AdtDecl const * decl );
         // Remove typedefs from statement lists.
         ast::CompoundStmt const * previsit( ast::CompoundStmt const * stmt );
@@ -65 +66 @@
 }
 
+ast::AdtDecl const * EliminateTypedefCore::previsit( ast::AdtDecl const * decl ) {
+        return field_erase_if( decl, &ast::AdtDecl::members, isTypedef );
+}
+
 ast::CompoundStmt const * EliminateTypedefCore::previsit( ast::CompoundStmt const * stmt ) {
         return field_erase_if( stmt, &ast::CompoundStmt::kids, isTypedefStmt );

src/Validate/FixQualifiedTypes.cpp

@@ -59 +59 @@
                                 instp = inst;
                         } else if ( auto inst = parent.as<ast::UnionInstType>() ) {
+                                aggr = inst->base;
+                                instp = inst;
+                        } else if ( auto inst = parent.as<ast::AdtInstType>() ) {
                                 aggr = inst->base;
                                 instp = inst;

src/Validate/HoistStruct.cpp

@@ -28 +28 @@
         return dynamic_cast< ast::StructDecl const * >( decl )
                 || dynamic_cast< ast::UnionDecl const * >( decl )
-                || dynamic_cast< ast::StaticAssertDecl const * >( decl );
+                || dynamic_cast< ast::StaticAssertDecl const * >( decl )
+                || dynamic_cast< ast::AdtDecl const * >( decl );
 }
 
@@ -45 +46 @@
         ast::UnionInstType const * previsit( ast::UnionInstType const * type );
         ast::EnumInstType const * previsit( ast::EnumInstType const * type );
+        ast::AdtDecl const * previsit( ast::AdtDecl const * decl );
+        ast::AdtDecl const * postvisit( ast::AdtDecl const * decl );
 
 private:
@@ -100 +103 @@
 }
 
+ast::AdtDecl const * HoistStructCore::previsit( ast::AdtDecl const * decl ) {
+        return preAggregate( decl );
+}
+
+ast::AdtDecl const * HoistStructCore::postvisit( ast::AdtDecl const * decl ) {
+        return postAggregate( decl );
+}
+
 ast::StructDecl const * HoistStructCore::postvisit( ast::StructDecl const * decl ) {
         return postAggregate( decl );
@@ -138 +149 @@
 }
 
-void hoistAdt( [[maybe_unused]] ast::TranslationUnit & trnaslationUnit ) {
-        
-}
-
 } // namespace Validate
 

src/Validate/HoistStruct.hpp

@@ -24 +24 @@
 /// Flattens nested type declarations. (Run right after Fix Qualified Types.)
 void hoistStruct( ast::TranslationUnit & translationUnit );
-void hoistAdt( ast::TranslationUnit & trnaslationUnit );
 
 }

src/Validate/LinkReferenceToTypes.cpp

@@ -20 +20 @@
 #include "Validate/ForallPointerDecay.hpp"
 #include "Validate/NoIdSymbolTable.hpp"
+#include <assert.h>
 
 namespace Validate {
@@ -35 +36 @@
         ast::UnionInstType const * postvisit( ast::UnionInstType const * type );
         ast::TraitInstType const * postvisit( ast::TraitInstType const * type );
+        ast::AdtInstType const * postvisit( ast::AdtInstType const * type );
         void previsit( ast::QualifiedType const * type );
         void postvisit( ast::QualifiedType const * type );
@@ -107 +109 @@
                 auto mut = ast::mutate( type );
                 forwardStructs[ mut->name ].push_back( mut );
+                type = mut;
+        }
+        return type;
+}
+
+ast::AdtInstType const * LinkTypesCore::postvisit( ast::AdtInstType const * type ) {
+        ast::AdtDecl const * decl = symtab.lookupAdt( type->name );
+        assert( decl != nullptr );
+        if ( decl ) {
+                auto mut = ast::mutate( type );
+                mut->base = const_cast<ast::AdtDecl *>( decl );
                 type = mut;
         }

src/Validate/NoIdSymbolTable.hpp

@@ -41 +41 @@
         FORWARD_1( lookupUnion , const std::string & )
         FORWARD_1( lookupTrait , const std::string & )
+        FORWARD_1( lookupAdt   , const std::string & )
         FORWARD_1( addType  , const ast::NamedTypeDecl * )
         FORWARD_1( addStruct, const ast::StructDecl *    )
@@ -49 +50 @@
         FORWARD_1( addStruct, const std::string &        )
         FORWARD_1( addUnion , const std::string &        )
+        FORWARD_1( addAdt   , const std::string &                )
         FORWARD_2( addWith  , const std::vector< ast::ptr<ast::Expr> > &, const ast::Decl * )
 

src/Validate/ReplaceTypedef.cpp

@@ -60 +60 @@
         ast::StructDecl const * previsit( ast::StructDecl const * );
         ast::UnionDecl const * previsit( ast::UnionDecl const * );
+        ast::AdtDecl const * previsit( ast::AdtDecl const * );
         void previsit( ast::EnumDecl const * );
         void previsit( ast::TraitDecl const * );
@@ -90 +91 @@
 }
 
+// Here, 5/30
 ast::Type const * ReplaceTypedefCore::postvisit(
                 ast::TypeInstType const * type ) {
         // Instances of typedef types will come here. If it is an instance
         // of a typedef type, link the instance to its actual type.
-        TypedefMap::const_iterator def = typedefNames.find( type->name );
+        TypedefMap::const_iterator def = typedefNames.find( type->name ); // because of this
         if ( def != typedefNames.end() ) {
                 ast::Type * ret = ast::deepCopy( def->second.first->base );
@@ -260 +262 @@
 }
 
+ast::AdtDecl const * ReplaceTypedefCore::previsit( ast::AdtDecl const * decl ) {
+        visit_children = false;
+        addImplicitTypedef( decl );
+        return handleAggregate( decl );
+}
+
 ast::UnionDecl const * ReplaceTypedefCore::previsit( ast::UnionDecl const * decl ) {
         visit_children = false;
@@ -287 +295 @@
         } else if ( auto enumDecl = dynamic_cast<const ast::EnumDecl *>( aggrDecl ) ) {
                 type = new ast::EnumInstType( enumDecl->name );
+        } else if ( auto adtDecl = dynamic_cast<const ast::AdtDecl *>( aggrDecl )) {
+                type = new ast::AdtInstType( adtDecl->name );
         }
         assert( type );