Changeset c4c8571 for src/GenPoly

Timestamp:

Jul 28, 2022, 12:04:25 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

32d1383, d0fcc82

Parents:

3f95dab (diff), 2af1943 (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.

Message:

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

File:

• src/GenPoly/SpecializeNew.cpp (modified) (3 diffs)

src/GenPoly/SpecializeNew.cpp

@@ -230 +230 @@
         if ( auto tuple = type.as<ast::TupleType>() ) {
                 std::vector<ast::ptr<ast::Expr>> exprs;
-                for ( const ast::Type * t : *tuple ) {
+                for ( const ast::ptr<ast::Type> & t : *tuple ) {
                         exprs.push_back( structureArg( location, t, begin, end ) );
                 }
@@ -248 +248 @@
                         if (typeMap.count(typeInst->base)) {
                                 ast::TypeInstType * newInst = mutate(typeInst);
-                                newInst->expr_id = typeMap[typeInst->base].first;
-                                newInst->formal_usage = typeMap[typeInst->base].second;
+                                auto const & pair = typeMap[typeInst->base];
+                                newInst->expr_id = pair.first;
+                                newInst->formal_usage = pair.second;
                                 return newInst;
                         }
@@ -462 +463 @@
         if ( specialized != expr->arg ) {
                 // Assume that the specialization incorporates the cast.
-                std::cerr << expr <<std::endl;
                 return specialized;
         } else {