Changeset 271a5d3

Timestamp:

Nov 9, 2022, 12:30:24 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

5ce0659

Parents:

6411b7d

Message:

Cleaning old box pass for easier translation. Cleaned up more loops, particularly with the improved group_iterate.

File:

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

src/GenPoly/Box.cc

@@ -582 +582 @@
                         assert( funcType );
 
+                        // These iterators don't advance in unison.
                         std::list< DeclarationWithType* >::const_iterator fnParm = funcType->get_parameters().begin();
                         std::list< Expression* >::const_iterator fnArg = arg;
@@ -855 +856 @@
                         Statement *bodyStmt;
 
-                        Type::ForallList::const_iterator tyArg = realType->forall.begin();
-                        Type::ForallList::const_iterator tyParam = adapterType->forall.begin();
-                        Type::ForallList::const_iterator realTyParam = adaptee->forall.begin();
-                        for ( ; tyParam != adapterType->get_forall().end(); ++tyArg, ++tyParam, ++realTyParam ) {
-                                assert( tyArg != realType->get_forall().end() );
-                                std::list< DeclarationWithType *>::const_iterator assertArg = (*tyArg)->get_assertions().begin();
-                                std::list< DeclarationWithType *>::const_iterator assertParam = (*tyParam)->get_assertions().begin();
-                                std::list< DeclarationWithType *>::const_iterator realAssertParam = (*realTyParam)->get_assertions().begin();
-                                for ( ; assertParam != (*tyParam)->get_assertions().end(); ++assertArg, ++assertParam, ++realAssertParam ) {
-                                        assert( assertArg != (*tyArg)->get_assertions().end() );
-                                        adapteeApp->get_args().push_back( makeAdapterArg( *assertParam, *assertArg, *realAssertParam, tyVars ) );
+                        for ( auto tys : group_iterate( realType->forall, adapterType->forall, adaptee->forall ) ) {
+                                TypeDecl * tyArg = std::get<0>( tys );
+                                TypeDecl * tyParam = std::get<1>( tys );
+                                TypeDecl * realTyParam = std::get<2>( tys );
+                                for ( auto asserts : group_iterate( tyArg->assertions, tyParam->assertions, realTyParam->assertions ) ) {
+                                        DeclarationWithType * assertArg = std::get<0>( asserts );
+                                        DeclarationWithType * assertParam = std::get<1>( asserts );
+                                        DeclarationWithType * realAssertParam = std::get<2>( asserts );
+                                        adapteeApp->args.push_back( makeAdapterArg( assertParam, assertArg, realAssertParam, tyVars ) );
                                 } // for
                         } // for
@@ -1093 +1092 @@
                 Expression *Pass1::postmutate( ApplicationExpr *appExpr ) {
                         // std::cerr << "mutate appExpr: " << InitTweak::getFunctionName( appExpr ) << std::endl;
-                        // for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {
-                        //      std::cerr << i->first << " ";
+                        // for ( auto tyVar : scopeTyVars ) {
+                        //      std::cerr << tyVar.first << " ";
                         // }
                         // std::cerr << "\n";
@@ -1683 +1682 @@
                         bool hasDynamicLayout = false;
 
-                        std::list< TypeDecl* >::const_iterator baseParam = baseParams.begin();
-                        std::list< Expression* >::const_iterator typeParam = typeParams.begin();
-                        for ( ; baseParam != baseParams.end() && typeParam != typeParams.end(); ++baseParam, ++typeParam ) {
+                        for ( auto paramPair : group_iterate( baseParams, typeParams ) ) {
+                                TypeDecl * baseParam = std::get<0>( paramPair );
+                                Expression * typeParam = std::get<1>( paramPair );
                                 // skip non-otype parameters
-                                if ( ! (*baseParam)->isComplete() ) continue;
-                                TypeExpr *typeExpr = dynamic_cast< TypeExpr* >( *typeParam );
+                                if ( ! baseParam->isComplete() ) continue;
+                                TypeExpr *typeExpr = dynamic_cast< TypeExpr* >( typeParam );
                                 assert( typeExpr && "all otype parameters should be type expressions" );
 
@@ -1695 +1694 @@
                                 if ( isPolyType( type ) ) hasDynamicLayout = true;
                         }
-                        assert( baseParam == baseParams.end() && typeParam == typeParams.end() );
 
                         return hasDynamicLayout;
@@ -1851 +1849 @@
                                         // build initializer list for offset array
                                         std::list< Initializer* > inits;
-                                        for ( std::list< Declaration* >::const_iterator member = baseMembers.begin(); member != baseMembers.end(); ++member ) {
-                                                if ( DeclarationWithType *memberDecl = dynamic_cast< DeclarationWithType* >( *member ) ) {
-                                                        inits.push_back( new SingleInit( new OffsetofExpr( ty->clone(), memberDecl ) ) );
-                                                } else {
-                                                        assertf( false, "Requesting offset of Non-DWT member: %s", toString( *member ).c_str() );
-                                                }
+                                        for ( Declaration * const member : baseMembers ) {
+                                                DeclarationWithType *memberDecl = dynamic_cast< DeclarationWithType* >( member );
+                                                assertf( memberDecl, "Requesting offset of Non-DWT member: %s", toString( member ).c_str() );
+                                                inits.push_back( new SingleInit( new OffsetofExpr( ty->clone(), memberDecl ) ) );
                                         }