Changes in src/GenPoly/InstantiateGenericNew.cpp [bc899d6:e01eb4a]

File:

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

src/GenPoly/InstantiateGenericNew.cpp

@@ -26 +26 @@
 #include "AST/Pass.hpp"                // for Pass, WithGuard, WithShortCi...
 #include "AST/TranslationUnit.hpp"     // for TranslationUnit
-#include "AST/Vector.hpp"              // for vector
 #include "CodeGen/OperatorTable.h"     // for isAssignment
 #include "Common/ScopedMap.h"          // for ScopedMap
@@ -40 +39 @@
 // Utilities:
 
-using type_vector = ast::vector< ast::TypeExpr >;
+using type_vector = std::vector< ast::ptr< ast::TypeExpr > >;
 
 /// Abstracts type equality for a list of parameter types.
 struct TypeList {
         TypeList() : params() {}
-        TypeList( ast::vector< ast::Type > const & params ) :
+        TypeList( std::vector< ast::ptr< ast::Type > > const & params ) :
                 params( params ) {}
-        TypeList( ast::vector< ast::Type > && params ) :
+        TypeList( std::vector< ast::ptr< ast::Type > > && params ) :
                 params( std::move( params ) ) {}
         TypeList( TypeList const & that ) : params( that.params ) {}
         TypeList( TypeList && that ) : params( std::move( that.params ) ) {}
 
-        TypeList( ast::vector< ast::TypeExpr > const & exprs ) :
+        TypeList( std::vector< ast::ptr< ast::TypeExpr > > const & exprs ) :
                         params() {
                 for ( auto expr : exprs ) {
@@ -83 +82 @@
         }
 
-        ast::vector<ast::Type> params;
+        std::vector<ast::ptr<ast::Type>> params;
 };
 
@@ -104 +103 @@
         /// returns null if no such value exists.
         ast::AggregateDecl const * lookup(
-                        ast::AggregateDecl const * key,
-                        type_vector const & params ) const {
+                        ast::AggregateDecl const * key, type_vector const & params ) const {
                 // This type repackaging is used for the helpers.
                 ast::ptr<ast::AggregateDecl> ptr = key;
@@ -152 +150 @@
 }
 
-bool isDtypeStatic( ast::vector<ast::TypeDecl> const & baseParams ) {
+bool isDtypeStatic( std::vector<ast::ptr<ast::TypeDecl>> const & baseParams ) {
         return std::all_of( baseParams.begin(), baseParams.end(),
                 []( ast::TypeDecl const * td ){ return !td->isComplete(); }
@@ -163 +161 @@
 /// least one parameter type, and dynamic if there is no concrete instantiation.
 GenericType makeSubstitutions(
-                ast::vector<ast::TypeExpr> & out,
-                ast::vector<ast::TypeDecl> const & baseParams,
-                ast::vector<ast::Expr> const & params ) {
+                std::vector<ast::ptr<ast::TypeExpr>> & out,
+                std::vector<ast::ptr<ast::TypeDecl>> const & baseParams,
+                std::vector<ast::ptr<ast::Expr>> const & params ) {
         GenericType gt = GenericType::dtypeStatic;
 
@@ -216 +214 @@
 /// Substitutes types of members according to baseParams => typeSubs,
 /// returning the result in a new vector.
-ast::vector<ast::Decl> substituteMembers(
-                ast::vector<ast::Decl> const & members,
-                ast::vector<ast::TypeDecl> const & baseParams,
-                ast::vector<ast::TypeExpr> const & typeSubs ) {
-        ast::vector<ast::Decl> out;
+std::vector<ast::ptr<ast::Decl>> substituteMembers(
+                std::vector<ast::ptr<ast::Decl>> const & members,
+                std::vector<ast::ptr<ast::TypeDecl>> const & baseParams,
+                std::vector<ast::ptr<ast::TypeExpr>> const & typeSubs ) {
+        std::vector<ast::ptr<ast::Decl>> out;
         ast::TypeSubstitution subs( baseParams, typeSubs );
         for ( ast::ptr<ast::Decl> const & member : members ) {
@@ -237 +235 @@
 /// modifying them in-place.
 void substituteMembersHere(
-                ast::vector<ast::Decl> & members,
-                ast::vector<ast::TypeDecl> const & baseParams,
-                ast::vector<ast::TypeExpr> const & typeSubs ) {
+                std::vector<ast::ptr<ast::Decl>> & members,
+                std::vector<ast::ptr<ast::TypeDecl>> const & baseParams,
+                std::vector<ast::ptr<ast::TypeExpr>> const & typeSubs ) {
         ast::TypeSubstitution subs( baseParams, typeSubs );
         for ( ast::ptr<ast::Decl> & member : members ) {
@@ -287 +285 @@
 
         ast::Expr const * fixMemberExpr(
-                ast::vector<ast::TypeDecl> const & baseParams,
+                std::vector<ast::ptr<ast::TypeDecl>> const & baseParams,
                 ast::MemberExpr const * memberExpr );
 
@@ -351 +349 @@
 
 ast::Expr const * FixDtypeStatic::fixMemberExpr(
-                ast::vector<ast::TypeDecl> const & baseParams,
+                std::vector<ast::ptr<ast::TypeDecl>> const & baseParams,
                 ast::MemberExpr const * memberExpr ) {
         // Need to cast dtype-static member expressions to their actual type
@@ -463 +461 @@
                 type_vector const & typeSubs, ast::UnionDecl const * decl );
 
-        void replaceParametersWithConcrete( ast::vector<ast::Expr> & params );
+        void replaceParametersWithConcrete( std::vector<ast::ptr<ast::Expr>> & params );
         ast::Type const * replaceWithConcrete( ast::Type const * type, bool doClone );
 
@@ -472 +470 @@
         /// marks it as stripped.
         void stripDtypeParams( ast::AggregateDecl * base,
-                ast::vector<ast::TypeDecl> & baseParams,
-                ast::vector<ast::TypeExpr> const & typeSubs );
+                std::vector<ast::ptr<ast::TypeDecl>> & baseParams,
+                std::vector<ast::ptr<ast::TypeExpr>> const & typeSubs );
 };
 
@@ -513 +511 @@
         // and put substitutions in typeSubs.
         assertf( inst->base, "Base data-type has parameters." );
-        ast::vector<ast::TypeExpr> typeSubs;
+        std::vector<ast::ptr<ast::TypeExpr>> typeSubs;
         GenericType gt = makeSubstitutions( typeSubs, inst->base->params, inst->params );
         switch ( gt ) {
@@ -572 +570 @@
                 ast::AggregateDecl const * aggr =
                         expr->aggregate->result.strict_as<ast::BaseInstType>()->aggr();
-                ast::vector<ast::Decl> const & members = aggr->members;
+                std::vector<ast::ptr<ast::Decl>> const & members = aggr->members;
                 auto it = std::find( members.begin(), members.end(), expr->member );
                 memberIndex = std::distance( members.begin(), it );
@@ -645 +643 @@
 
 void GenericInstantiator::replaceParametersWithConcrete(
-                ast::vector<ast::Expr> & params ) {
+                std::vector<ast::ptr<ast::Expr>> & params ) {
         for ( ast::ptr<ast::Expr> & param : params ) {
                 auto paramType = param.as<ast::TypeExpr>();
@@ -675 +673 @@
 void GenericInstantiator::stripDtypeParams(
                 ast::AggregateDecl * base,
-                ast::vector<ast::TypeDecl> & baseParams,
-                ast::vector<ast::TypeExpr> const & typeSubs ) {
+                std::vector<ast::ptr<ast::TypeDecl>> & baseParams,
+                std::vector<ast::ptr<ast::TypeExpr>> const & typeSubs ) {
         substituteMembersHere( base->members, baseParams, typeSubs );