Changeset 2f42718 for src/GenPoly/Specialize.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/Specialize.cc (modified) (4 diffs)

src/GenPoly/Specialize.cc

@@ -91 +91 @@
                 if ( tuple1 && tuple2 ) {
                         if ( tuple1->size() != tuple2->size() ) return false;
-                        for ( auto types : group_iterate( tuple1->get_types(), tuple2->get_types() ) ) {
+                        for ( auto types : group_iterate( tuple1->types, tuple2->types ) ) {
                                 if ( ! matchingTupleStructure( std::get<0>( types ), std::get<1>( types ) ) ) return false;
                         }
@@ -115 +115 @@
         size_t functionParameterSize( FunctionType * ftype ) {
                 size_t sz = 0;
-                for ( DeclarationWithType * p : ftype->get_parameters() ) {
+                for ( DeclarationWithType * p : ftype->parameters ) {
                         sz += singleParameterSize( p->get_type() );
                 }
@@ -227 +227 @@
                 }
                 std::unique_ptr< FunctionType > actualTypeManager( actualType ); // for RAII
-                std::list< DeclarationWithType * >::iterator actualBegin = actualType->get_parameters().begin();
-                std::list< DeclarationWithType * >::iterator actualEnd = actualType->get_parameters().end();
+                auto actualBegin = actualType->parameters.begin();
+                auto actualEnd   = actualType->parameters.end();
 
                 std::list< Expression * > args;
-                for ( DeclarationWithType* param : thunkFunc->get_functionType()->get_parameters() ) {
+                for ( DeclarationWithType* param : thunkFunc->get_functionType()->parameters ) {
                         // name each thunk parameter and explode it - these are then threaded back into the actual function call.
                         param->set_name( paramNamer.newName() );
@@ -281 +281 @@
                 FunctionType *function = getFunctionType( appExpr->function->result );
                 assert( function );
-                std::list< DeclarationWithType* >::iterator formal;
+                std::vector< DeclarationWithType* >::iterator formal;
                 std::list< Expression* >::iterator actual;
-                for ( formal = function->get_parameters().begin(), actual = appExpr->get_args().begin(); formal != function->get_parameters().end() && actual != appExpr->get_args().end(); ++formal, ++actual ) {
+                for ( formal = function->parameters.begin(), actual = appExpr->get_args().begin(); formal != function->parameters.end() && actual != appExpr->get_args().end(); ++formal, ++actual ) {
                         *actual = doSpecialization( (*formal)->get_type(), *actual, &appExpr->inferParams );
                 }