Changeset 46aa60e for src/GenPoly

Timestamp:

Feb 23, 2024, 11:41:10 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

0a9b5c1, 1e93617

Parents:

3d5a8cb (diff), 1761046 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Peter A. Buhr <pabuhr@…> (02/23/24 18:54:24)

git-committer:

Peter A. Buhr <pabuhr@…> (02/23/24 23:41:10)

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/GenPoly/Box.cpp (modified) (2 diffs)

src/GenPoly/Box.cpp

@@ -1109 +1109 @@
         );
 
-        for ( auto group : group_iterate( realType->assertions,
-                        adapterType->assertions, adaptee->assertions ) ) {
-                auto assertArg = std::get<0>( group );
-                auto assertParam = std::get<1>( group );
-                auto assertReal = std::get<2>( group );
+        for ( auto const & [assertArg, assertParam, assertReal] : group_iterate(
+                        realType->assertions, adapterType->assertions, adaptee->assertions ) ) {
                 adapteeApp->args.push_back( makeAdapterArg(
                         assertParam->var, assertArg->var->get_type(),
@@ -1970 +1967 @@
         bool hasDynamicLayout = false;
 
-        for ( auto pair : group_iterate( baseParams, typeParams ) ) {
-                auto baseParam = std::get<0>( pair );
-                auto typeParam = std::get<1>( pair );
+        for ( auto const & [baseParam, typeParam] : group_iterate(
+                        baseParams, typeParams ) ) {
                 if ( !baseParam->isComplete() ) continue;
                 ast::TypeExpr const * typeExpr = typeParam.as<ast::TypeExpr>();