Changes in src/GenPoly/SpecializeNew.cpp [c6b4432:8f31be6]

File:

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

src/GenPoly/SpecializeNew.cpp

@@ -23 +23 @@
 #include "GenPoly/GenPoly.h"             // for getFunctionType
 #include "ResolvExpr/FindOpenVars.h"     // for findOpenVars
+#include "ResolvExpr/TypeEnvironment.h"  // for FirstOpen, FirstClosed
 
 namespace GenPoly {
@@ -80 +81 @@
 }
 
-// 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;
+// 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;
+        }
 }
 
 // Find the total number of components in a parameter list.
 size_t functionParameterSize( const ast::FunctionType * type ) {
-        return flatTypeListSize( type->params );
+        size_t sum = 0;
+        for ( auto param : type->params ) {
+                sum += flatTupleSize( param );
+        }
+        return sum;
 }