Changeset 2f42718 for src/InitTweak

Timestamp:

Feb 22, 2019, 10:43:29 AM (7 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)

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (2 diffs)
• GenInit.cc (modified) (3 diffs)
• InitTweak.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -1042 +1042 @@
                         if ( checkWarnings( function ) ) {
                                 FunctionType * type = function->get_functionType();
-                                assert( ! type->get_parameters().empty() );
-                                thisParam = strict_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
+                                assert( ! type->parameters.empty() );
+                                thisParam = strict_dynamic_cast< ObjectDecl * >( type->parameters.front() );
                                 Type * thisType = getPointerBase( thisParam->get_type() );
                                 StructInstType * structType = dynamic_cast< StructInstType * >( thisType );
@@ -1099 +1099 @@
                                         if ( isCopyConstructor( function ) ) {
                                                 // if copy ctor, need to pass second-param-of-this-function.field
-                                                std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+                                                auto & params = function->get_functionType()->parameters;
                                                 assert( params.size() == 2 );
                                                 arg2 = new MemberExpr( field, new VariableExpr( params.back() ) );

src/InitTweak/GenInit.cc

@@ -127 +127 @@
 
         void ReturnFixer::premutate( ReturnStmt *returnStmt ) {
-                std::list< DeclarationWithType * > & returnVals = ftype->get_returnVals();
+                auto & returnVals = ftype->returnVals;
                 assert( returnVals.size() == 0 || returnVals.size() == 1 );
                 // hands off if the function returns a reference - we don't want to allocate a temporary if a variable's address
@@ -242 +242 @@
                 // if this function is a user-defined constructor or destructor, mark down the type as "managed"
                 if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && CodeGen::isCtorDtor( dwt->get_name() ) ) {
-                        std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
+                        auto & params = GenPoly::getFunctionType( dwt->get_type() )->parameters;
                         assert( ! params.empty() );
                         Type * type = InitTweak::getPointerBase( params.front()->get_type() );
@@ -335 +335 @@
                 // go through assertions and recursively add seen ctor/dtors
                 for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) {
-                        for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) {
+                        for ( DeclarationWithType *& assertion : tyDecl->assertions ) {
                                 managedTypes.handleDWT( assertion );
                         }

src/InitTweak/InitTweak.cc

@@ -410 +410 @@
                                 FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
                                 assert( funcType );
-                                return funcType->get_parameters().size() == 1;
+                                return funcType->parameters.size() == 1;
                         }
                         return false;
@@ -616 +616 @@
                 if ( ftype->parameters.size() != 2 ) return nullptr;
 
-                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
+                Type * t1 = getPointerBase( ftype->parameters.front()->get_type() );
                 Type * t2 = ftype->parameters.back()->get_type();
                 assert( t1 );