Changes in src/GenPoly/InstantiateGeneric.cpp [30bf6bf:a21aaff]

File:

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

src/GenPoly/InstantiateGeneric.cpp

@@ -42 +42 @@
 
 using type_vector = ast::vector< ast::TypeExpr >;
-
-template<typename C, typename V>
-bool contains( C const & container, V const & value ) {
-        return std::any_of( container.begin(), container.end(),
-                        [value]( auto& element ){ return element == value; } );
-}
 
 /// Abstracts type equality for a list of parameter types.
@@ -429 +423 @@
 }
 
-class GenericInstantiator final :
+struct GenericInstantiator final :
                 public ast::WithCodeLocation,
                 public ast::WithConstTypeSubstitution,
@@ -450 +444 @@
         /// member from an instantiation.
         int memberIndex = -1;
-        /// The polymorphic types we are currently instantiating.
-        ast::vector<ast::Decl> instantiating;
-public:
 
         GenericInstantiator() :
@@ -606 +597 @@
                         );
 
-                        // Insert the declaration so it doesn't create it again,
+                        // Forward declare before recursion. (TODO: Only when needed, #199.)
                         insert( inst, typeSubs, newDecl );
-                        // ... but mark this declaration as one we are working on.
-                        auto guard = makeFuncGuard(
-                                [this, newDecl](){ instantiating.push_back( newDecl ); },
-                                [this](){ instantiating.pop_back(); } );
+                        if ( AggrDecl const * forwardDecl = ast::asForward( newDecl ) ) {
+                                declsToAddBefore.push_back( forwardDecl );
+                        }
                         // Recursively instantiate members:
                         concDecl = strict_dynamic_cast<AggrDecl const *>(
                                 newDecl->accept( *visitor ) );
-
-                        // Produce the declaration after its members are instantiated.
+                        // Must occur before declaration is added so
+                        // that member instantiation appear first.
                         declsToAddBefore.push_back( concDecl );
-                } else if ( contains( instantiating, concDecl ) ) {
-                        if ( AggrDecl const * forwardDecl = ast::asForward( concDecl ) ) {
-                                declsToAddBefore.push_back( forwardDecl );
-                        }
                 }
                 return new ast::SueInstType<AggrDecl>( concDecl, inst->qualifiers );