Changes in src/GenPoly/InstantiateGenericNew.cpp [01865fb:8f1e035]

File:

• src/GenPoly/InstantiateGenericNew.cpp (modified) (4 diffs)

src/GenPoly/InstantiateGenericNew.cpp

@@ -22 +22 @@
 
 #include "AST/Copy.hpp"                // for deepCopy
+#include "AST/Create.hpp"              // for asForward
 #include "AST/Pass.hpp"                // for Pass, WithGuard, WithShortCi...
 #include "AST/TranslationUnit.hpp"     // for TranslationUnit
@@ -85 +86 @@
 
 /// Maps a key and a TypeList to a valuue. Also supports scoping.
-class InstantiationMap {
+class InstantiationMap final {
         /// Wraps value for a specific (AggregateDecl, TypeList) combination.
         using Instantiation = std::pair<TypeList, ast::ptr<ast::AggregateDecl>>;
@@ -255 +256 @@
 void stripInstParams( ast::BaseInstType * inst ) {
         inst->params.clear();
-}
-
-// TODO: I think this should become a generic helper.
-template<typename Aggr>
-Aggr * asForward( Aggr const * decl ) {
-        if ( !decl->body ) {
-                return nullptr;
-        }
-        Aggr * mut = ast::deepCopy( decl );
-        mut->body = false;
-        mut->members.clear();
-        return mut;
 }
 
@@ -553 +542 @@
                         // Forward declare before recursion. (TODO: Only when needed, #199.)
                         insert( inst, typeSubs, newDecl );
-                        if ( AggrDecl const * forwardDecl = asForward( newDecl ) ) {
+                        if ( AggrDecl const * forwardDecl = ast::asForward( newDecl ) ) {
                                 declsToAddBefore.push_back( forwardDecl );
                         }