Changeset e172f42 for src/Validate/Autogen.cpp

Timestamp:

Jun 16, 2023, 9:10:46 AM (19 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

5dbb9f3

Parents:

a0bd9a2 (diff), 62d62db (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ast-experimental'

File:

• src/Validate/Autogen.cpp (modified) (5 diffs)

src/Validate/Autogen.cpp

@@ -321 +321 @@
 void FuncGenerator::produceDecl( const ast::FunctionDecl * decl ) {
         assert( nullptr != decl->stmts );
+        const auto & oldParams = getGenericParams(type);
+        assert( decl->type_params.size() == oldParams.size());
+
+        /*
+        ast::DeclReplacer::TypeMap typeMap;
+        for (auto it = oldParams.begin(), jt = decl->type_params.begin(); it != oldParams.end(); ++it, ++jt) {
+                typeMap.emplace(*it, *jt);
+        }
+
+        const ast::FunctionDecl * mut = strict_dynamic_cast<const ast::FunctionDecl *>(ast::DeclReplacer::replace(decl, typeMap));
+        assert (mut == decl);
+        */
 
         definitions.push_back( decl );
@@ -352 +364 @@
         std::vector<ast::ptr<ast::TypeDecl>> type_params;
         std::vector<ast::ptr<ast::DeclWithType>> assertions;
+
+        ast::DeclReplacer::TypeMap typeMap;
         for ( auto & old_param : old_type_params ) {
                 ast::TypeDecl * decl = ast::deepCopy( old_param );
@@ -358 +372 @@
                 oldToNew.emplace( std::make_pair( old_param, decl ) );
                 type_params.push_back( decl );
+                typeMap.emplace(old_param, decl);
+        }
+
+        for (auto & param : params) {
+                param = ast::DeclReplacer::replace(param, typeMap);
+        }
+        for (auto & param : returns) {
+                param = ast::DeclReplacer::replace(param, typeMap);
         }
         replaceAll( params, oldToNew );
@@ -522 +544 @@
         InitTweak::InitExpander_new srcParam( src );
         // Assign to destination.
-        ast::Expr * dstSelect = new ast::MemberExpr(
+        ast::MemberExpr * dstSelect = new ast::MemberExpr(
                 location,
                 field,
@@ -574 +596 @@
                 }
 
-                ast::Expr * srcSelect = (srcParam) ? new ast::MemberExpr(
+                ast::MemberExpr * srcSelect = (srcParam) ? new ast::MemberExpr(
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;