Changeset 2f42718 for src/GenPoly/FindFunction.cc

Timestamp:

Feb 22, 2019, 10:43:29 AM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

no_list

Parents:

43e0949

Message:

Parameters and return value of functions are now vectors (and some related clean-up)

File:

• src/GenPoly/FindFunction.cc (modified) (4 diffs)

src/GenPoly/FindFunction.cc

@@ -29 +29 @@
         class FindFunction : public WithGuards, public WithVisitorRef<FindFunction>, public WithShortCircuiting {
           public:
-                FindFunction( std::list< FunctionType* > &functions, const TyVarMap &tyVars, bool replaceMode, FindFunctionPredicate predicate );
+                FindFunction( std::vector< FunctionType* > & functions, const TyVarMap &tyVars, bool replaceMode, FindFunctionPredicate predicate );
 
                 void premutate( FunctionType * functionType );
@@ -37 +37 @@
                 void handleForall( const Type::ForallList &forall );
 
-                std::list< FunctionType* > &functions;
+                std::vector< FunctionType* > &functions;
                 TyVarMap tyVars;
                 bool replaceMode;
@@ -43 +43 @@
         };
 
-        void findFunction( Type *type, std::list< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
+        void findFunction( Type *type, std::vector< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
                 PassVisitor<FindFunction> finder( functions, tyVars, false, predicate );
                 type->acceptMutator( finder );
         }
 
-        void findAndReplaceFunction( Type *&type, std::list< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
+        void findAndReplaceFunction( Type *&type, std::vector< FunctionType* > &functions, const TyVarMap &tyVars, FindFunctionPredicate predicate ) {
                 PassVisitor<FindFunction> finder( functions, tyVars, true, predicate );
                 type = type->acceptMutator( finder );
         }
 
-        FindFunction::FindFunction( std::list< FunctionType* > &functions, const TyVarMap &tyVars, bool replaceMode, FindFunctionPredicate predicate )
+        FindFunction::FindFunction( std::vector< FunctionType* > &functions, const TyVarMap &tyVars, bool replaceMode, FindFunctionPredicate predicate )
                 : functions( functions ), tyVars( tyVars ), replaceMode( replaceMode ), predicate( predicate ) {
         }
@@ -70 +70 @@
                 GuardScope( tyVars );
                 handleForall( functionType->get_forall() );
-                mutateAll( functionType->get_returnVals(), *visitor );
+                mutateAll( functionType->returnVals, *visitor );
         }