Changeset 278e162 for src/GenPoly/SpecializeNew.cpp

Timestamp:

Oct 23, 2023, 11:13:00 AM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

cb94e41

Parents:

4d2d7e27 (diff), abb04a4 (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) (1 diff)

src/GenPoly/SpecializeNew.cpp

@@ -81 +81 @@
 }
 
-// The number of elements in a type if it is a flattened tuple.
-size_t flatTupleSize( const ast::Type * type ) {
-        if ( auto tuple = dynamic_cast<const ast::TupleType *>( type ) ) {
-                size_t sum = 0;
-                for ( auto t : *tuple ) {
-                        sum += flatTupleSize( t );
-                }
-                return sum;
-        } else {
-                return 1;
-        }
+// The number of elements in a list, if all tuples had been flattened.
+size_t flatTypeListSize( const std::vector<ast::ptr<ast::Type>> & types ) {
+        size_t sum = 0;
+        for ( const ast::ptr<ast::Type> & type : types ) {
+                if ( const ast::TupleType * tuple = type.as<ast::TupleType>() ) {
+                        sum += flatTypeListSize( tuple->types );
+                } else {
+                        sum += 1;
+                }
+        }
+        return sum;
 }
 
 // Find the total number of components in a parameter list.
 size_t functionParameterSize( const ast::FunctionType * type ) {
-        size_t sum = 0;
-        for ( auto param : type->params ) {
-                sum += flatTupleSize( param );
-        }
-        return sum;
+        return flatTypeListSize( type->params );
 }