Changeset 994028dc for src/GenPoly

Timestamp:

Oct 31, 2022, 2:17:21 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

f2ff0a6

Parents:

e3bf4cf

Message:

Cleaning old box pass for easier translation. Clean-up more loops.

File:

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

src/GenPoly/Box.cc

@@ -622 +622 @@
 
                 void Pass1::replaceParametersWithConcrete( ApplicationExpr *appExpr, std::list< Expression* >& params ) {
-                        for ( std::list< Expression* >::iterator param = params.begin(); param != params.end(); ++param ) {
-                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
+                        for ( Expression * const param : params ) {
+                                TypeExpr *paramType = dynamic_cast< TypeExpr* >( param );
                                 assertf(paramType, "Aggregate parameters should be type expressions");
                                 paramType->set_type( replaceWithConcrete( appExpr, paramType->get_type(), false ) );
@@ -742 +742 @@
 
                 void Pass1::boxParams( ApplicationExpr *appExpr, FunctionType *function, std::list< Expression *>::iterator &arg, const TyVarMap &exprTyVars ) {
-                        for ( std::list< DeclarationWithType *>::const_iterator param = function->get_parameters().begin(); param != function->parameters.end(); ++param, ++arg ) {
-                                assertf( arg != appExpr->args.end(), "boxParams: missing argument for param %s to %s in %s", toString( *param ).c_str(), toString( function ).c_str(), toString( appExpr ).c_str() );
-                                addCast( *arg, (*param)->get_type(), exprTyVars );
-                                boxParam( (*param)->get_type(), *arg, exprTyVars );
+                        for ( DeclarationWithType * param : function->parameters ) {
+                                assertf( arg != appExpr->args.end(), "boxParams: missing argument for param %s to %s in %s", toString( param ).c_str(), toString( function ).c_str(), toString( appExpr ).c_str() );
+                                addCast( *arg, param->get_type(), exprTyVars );
+                                boxParam( param->get_type(), *arg, exprTyVars );
+                                ++arg;
                         } // for
                 }
@@ -751 +752 @@
                 void Pass1::addInferredParams( ApplicationExpr *appExpr, FunctionType *functionType, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) {
                         std::list< Expression *>::iterator cur = arg;
-                        for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) {
-                                for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->assertions.begin(); assert != (*tyVar)->assertions.end(); ++assert ) {
-                                        InferredParams::const_iterator inferParam = appExpr->inferParams.find( (*assert)->get_uniqueId() );
-                                        assertf( inferParam != appExpr->inferParams.end(), "addInferredParams missing inferred parameter: %s in: %s", toString( *assert ).c_str(), toString( appExpr ).c_str() );
+                        for ( TypeDecl * const tyVar : functionType->forall ) {
+                                for ( DeclarationWithType * const assert : tyVar->assertions ) {
+                                        InferredParams::const_iterator inferParam = appExpr->inferParams.find( assert->get_uniqueId() );
+                                        assertf( inferParam != appExpr->inferParams.end(), "addInferredParams missing inferred parameter: %s in: %s", toString( assert ).c_str(), toString( appExpr ).c_str() );
                                         Expression *newExpr = inferParam->second.expr->clone();
-                                        addCast( newExpr, (*assert)->get_type(), tyVars );
-                                        boxParam( (*assert)->get_type(), newExpr, tyVars );
+                                        addCast( newExpr, assert->get_type(), tyVars );
+                                        boxParam( assert->get_type(), newExpr, tyVars );
                                         appExpr->get_args().insert( cur, newExpr );
                                 } // for
@@ -1210 +1211 @@
                         std::list< DeclarationWithType *> &paramList = functionType->parameters;
                         std::list< FunctionType *> functions;
-                        for (  DeclarationWithType * const arg : functionType->parameters ) {
+                        for ( DeclarationWithType * const arg : functionType->parameters ) {
                                 Type *orig = arg->get_type();
                                 findAndReplaceFunction( orig, functions, scopeTyVars, needsAdapter );