Changeset 24d6572 for src/Validate/Autogen.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (13 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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 'master' into ast-experimental

File:

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

src/Validate/Autogen.cpp

@@ -25 +25 @@
 
 #include "AST/Attribute.hpp"
+#include "AST/Copy.hpp"
 #include "AST/Create.hpp"
 #include "AST/Decl.hpp"
@@ -39 +40 @@
 #include "InitTweak/GenInit.h"     // for fixReturnStatements
 #include "InitTweak/InitTweak.h"   // for isAssignment, isCopyConstructor
+#include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
 #include "SymTab/Mangler.h"        // for Mangler
 #include "CompilationState.h"
-
-// TODO: The other new ast function should be moved over to this file.
-#include "SymTab/Autogen.h"
 
 namespace Validate {
@@ -94 +93 @@
 
         const CodeLocation& getLocation() const { return getDecl()->location; }
-        ast::FunctionDecl * genProto( const std::string& name,
+        ast::FunctionDecl * genProto( std::string&& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const;
@@ -322 +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 );
@@ -335 +346 @@
 }
 
+void replaceAll( std::vector<ast::ptr<ast::DeclWithType>> & dwts,
+                const ast::DeclReplacer::TypeMap & map ) {
+        for ( auto & dwt : dwts ) {
+                dwt = strict_dynamic_cast<const ast::DeclWithType *>(
+                                ast::DeclReplacer::replace( dwt, map ) );
+        }
+}
+
 /// Generates a basic prototype function declaration.
-ast::FunctionDecl * FuncGenerator::genProto( const std::string& name,
+ast::FunctionDecl * FuncGenerator::genProto( std::string&& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const {
@@ -342 +361 @@
         // Handle generic prameters and assertions, if any.
         auto const & old_type_params = getGenericParams( type );
+        ast::DeclReplacer::TypeMap oldToNew;
         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 );
-                for ( auto assertion : decl->assertions ) {
-                        assertions.push_back( assertion );
-                }
-                decl->assertions.clear();
+                decl->init = nullptr;
+                splice( assertions, decl->assertions );
+                oldToNew.emplace( std::make_pair( old_param, decl ) );
                 type_params.push_back( decl );
-        }
-        // TODO: The values in params and returns still may point at the old
-        // generic params, that does not appear to be an issue but perhaps it
-        // should be addressed.
+                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 );
+        replaceAll( returns, oldToNew );
+        replaceAll( assertions, oldToNew );
 
         ast::FunctionDecl * decl = new ast::FunctionDecl(
                 // Auto-generated routines use the type declaration's location.
                 getLocation(),
-                name,
+                std::move( name ),
                 std::move( type_params ),
                 std::move( assertions ),
@@ -423 +452 @@
         for ( unsigned int index = 0 ; index < fields ; ++index ) {
                 auto member = aggr->members[index].strict_as<ast::DeclWithType>();
-                if ( SymTab::isUnnamedBitfield(
+                if ( ast::isUnnamedBitfield(
                                 dynamic_cast<const ast::ObjectDecl *>( member ) ) ) {
                         if ( index == fields - 1 ) {
@@ -515 +544 @@
         InitTweak::InitExpander_new srcParam( src );
         // Assign to destination.
-        ast::Expr * dstSelect = new ast::MemberExpr(
+        ast::MemberExpr * dstSelect = new ast::MemberExpr(
                 location,
                 field,
@@ -567 +596 @@
                 }
 
-                ast::Expr * srcSelect = (srcParam) ? new ast::MemberExpr(
+                ast::MemberExpr * srcSelect = (srcParam) ? new ast::MemberExpr(
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;
@@ -599 +628 @@
                 // Not sure why it could be null.
                 // Don't make a function for a parameter that is an unnamed bitfield.
-                if ( nullptr == field || SymTab::isUnnamedBitfield( field ) ) {
+                if ( nullptr == field || ast::isUnnamedBitfield( field ) ) {
                         continue;
                 // Matching Parameter: Initialize the field by copy.