Changes in src/Validate/Autogen.cpp [8913de4:20737104]

File:

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

src/Validate/Autogen.cpp

@@ -25 +25 @@
 
 #include "AST/Attribute.hpp"
-#include "AST/Copy.hpp"
 #include "AST/Create.hpp"
 #include "AST/Decl.hpp"
@@ -40 +39 @@
 #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 {
@@ -93 +94 @@
 
         const CodeLocation& getLocation() const { return getDecl()->location; }
-        ast::FunctionDecl * genProto( std::string&& name,
+        ast::FunctionDecl * genProto( const std::string& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const;
@@ -334 +335 @@
 }
 
-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( std::string&& name,
+ast::FunctionDecl * FuncGenerator::genProto( const std::string& name,
                 std::vector<ast::ptr<ast::DeclWithType>>&& params,
                 std::vector<ast::ptr<ast::DeclWithType>>&& returns ) const {
@@ -349 +342 @@
         // 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;
         for ( auto & old_param : old_type_params ) {
                 ast::TypeDecl * decl = ast::deepCopy( old_param );
-                decl->init = nullptr;
-                splice( assertions, decl->assertions );
-                oldToNew.emplace( std::make_pair( old_param, decl ) );
+                for ( auto assertion : decl->assertions ) {
+                        assertions.push_back( assertion );
+                }
+                decl->assertions.clear();
                 type_params.push_back( decl );
         }
-        replaceAll( params, oldToNew );
-        replaceAll( returns, oldToNew );
-        replaceAll( assertions, oldToNew );
+        // 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.
 
         ast::FunctionDecl * decl = new ast::FunctionDecl(
                 // Auto-generated routines use the type declaration's location.
                 getLocation(),
-                std::move( name ),
+                name,
                 std::move( type_params ),
                 std::move( assertions ),
@@ -430 +423 @@
         for ( unsigned int index = 0 ; index < fields ; ++index ) {
                 auto member = aggr->members[index].strict_as<ast::DeclWithType>();
-                if ( ast::isUnnamedBitfield(
+                if ( SymTab::isUnnamedBitfield(
                                 dynamic_cast<const ast::ObjectDecl *>( member ) ) ) {
                         if ( index == fields - 1 ) {
@@ -606 +599 @@
                 // Not sure why it could be null.
                 // Don't make a function for a parameter that is an unnamed bitfield.
-                if ( nullptr == field || ast::isUnnamedBitfield( field ) ) {
+                if ( nullptr == field || SymTab::isUnnamedBitfield( field ) ) {
                         continue;
                 // Matching Parameter: Initialize the field by copy.