Changeset 0658672 for src/Validate/HoistStruct.cpp

Timestamp:

Jun 9, 2023, 4:56:02 PM (12 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ast-experimental, master

Children:

38e266c

Parents:

758c9ef

Message:

Improved hoisting. However, I had to change some code because of other errors, so more work will have to be done. Also folded in another invariant for MemberExpr?.

File:

• src/Validate/HoistStruct.cpp (modified) (6 diffs)

src/Validate/HoistStruct.cpp

@@ -18 +18 @@
 #include <sstream>
 
+#include "AST/DeclReplacer.hpp"
 #include "AST/Pass.hpp"
 #include "AST/TranslationUnit.hpp"
+#include "AST/Vector.hpp"
 
 namespace Validate {
@@ -51 +53 @@
         template<typename AggrDecl>
         AggrDecl const * postAggregate( AggrDecl const * );
+        template<typename InstType>
+        InstType const * preCollectionInstType( InstType const * type );
 
         ast::AggregateDecl const * parent = nullptr;
@@ -66 +70 @@
         qualifiedName( decl, ss );
         return ss.str();
+}
+
+void extendParams( ast::vector<ast::TypeDecl> & dstParams,
+                ast::vector<ast::TypeDecl> const & srcParams ) {
+        if ( srcParams.empty() ) return;
+
+        ast::DeclReplacer::TypeMap newToOld;
+        ast::vector<ast::TypeDecl> params;
+        for ( ast::ptr<ast::TypeDecl> const & srcParam : srcParams ) {
+                ast::TypeDecl * dstParam = ast::deepCopy( srcParam.get() );
+                dstParam->init = nullptr;
+                newToOld.emplace( srcParam, dstParam );
+                for ( auto assertion : dstParam->assertions ) {
+                        assertion = ast::DeclReplacer::replace( assertion, newToOld );
+                }
+                params.emplace_back( dstParam );
+        }
+        spliceBegin( dstParams, params );
 }
 
@@ -74 +96 @@
                 mut->parent = parent;
                 mut->name = qualifiedName( mut );
-                return mut;
-        } else {
-                GuardValue( parent ) = decl;
-                return decl;
-        }
+                extendParams( mut->params, parent->params );
+                decl = mut;
+        }
+        GuardValue( parent ) = decl;
+        return decl;
 }
 
@@ -112 +134 @@
 }
 
+ast::AggregateDecl const * commonParent(
+                ast::AggregateDecl const * lhs, ast::AggregateDecl const * rhs ) {
+        for ( auto outer = lhs ; outer ; outer = outer->parent ) {
+                for ( auto inner = rhs ; inner ; inner = inner->parent ) {
+                        if ( outer == inner ) {
+                                return outer;
+                        }
+                }
+        }
+        return nullptr;
+}
+
+template<typename InstType>
+InstType const * HoistStructCore::preCollectionInstType( InstType const * type ) {
+    if ( !type->base->parent ) return type;
+    if ( type->base->params.empty() ) return type;
+
+    InstType * mut = ast::mutate( type );
+    ast::AggregateDecl const * parent =
+        commonParent( this->parent, mut->base->parent );
+    assert( parent );
+
+    std::vector<ast::ptr<ast::Expr>> args;
+    for ( const ast::ptr<ast::TypeDecl> & param : parent->params ) {
+        args.emplace_back( new ast::TypeExpr( param->location,
+            new ast::TypeInstType( param )
+        ) );
+    }
+    spliceBegin( mut->params, args );
+    return mut;
+}
+
 template<typename InstType>
 InstType const * preInstType( InstType const * type ) {
@@ -121 +175 @@
 
 ast::StructInstType const * HoistStructCore::previsit( ast::StructInstType const * type ) {
-        return preInstType( type );
+        return preInstType( preCollectionInstType( type ) );
 }
 
 ast::UnionInstType const * HoistStructCore::previsit( ast::UnionInstType const * type ) {
-        return preInstType( type );
+        return preInstType( preCollectionInstType( type ) );
 }