Changes in src/Tuples/TupleExpansion.cc [c92c09c:62423350]

File:

• src/Tuples/TupleExpansion.cc (modified) (6 diffs)

src/Tuples/TupleExpansion.cc

@@ -66 +66 @@
                 };
 
-                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithTypeSubstitution {
-                        Type * postmutate( TupleType * tupleType );
-
-                        void premutate( CompoundStmt * ) {
-                                GuardScope( typeMap );
+                class TupleTypeReplacer : public GenPoly::DeclMutator {
+                  public:
+                        typedef GenPoly::DeclMutator Parent;
+                        using Parent::mutate;
+
+                        virtual Type * mutate( TupleType * tupleType ) override;
+
+                        virtual CompoundStmt * mutate( CompoundStmt * stmt ) override {
+                                typeMap.beginScope();
+                                stmt = Parent::mutate( stmt );
+                                typeMap.endScope();
+                                return stmt;
                         }
                   private:
@@ -104 +111 @@
                 mutateAll( translationUnit, assnExpander );
 
-                PassVisitor<TupleTypeReplacer> replacer;
-                mutateAll( translationUnit, replacer );
+                TupleTypeReplacer replacer;
+                replacer.mutateDeclarationList( translationUnit );
 
                 PassVisitor<TupleIndexExpander> idxExpander;
@@ -211 +218 @@
         }
 
-        Type * TupleTypeReplacer::postmutate( TupleType * tupleType ) {
+        Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
+                tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
                 unsigned tupleSize = tupleType->size();
                 if ( ! typeMap.count( tupleSize ) ) {
@@ -218 +226 @@
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {
-                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", tupleSize, "_", i ), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", i ), Type::StorageClasses(), nullptr, TypeDecl::Any );
                                 decl->get_members().push_back( new ObjectDecl( toString("field_", i ), Type::StorageClasses(), LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
                                 decl->get_parameters().push_back( tyParam );
@@ -227 +235 @@
                         }
                         typeMap[tupleSize] = decl;
-                        declsToAddBefore.push_back( decl );
+                        addDeclaration( decl );
                 }
                 Type::Qualifiers qualifiers = tupleType->get_qualifiers();
@@ -233 +241 @@
                 StructDecl * decl = typeMap[tupleSize];
                 StructInstType * newType = new StructInstType( qualifiers, decl );
-                for ( auto p : group_iterate( tupleType->get_types(), decl->get_parameters() ) ) {
-                        Type * t = std::get<0>(p);
-                        TypeDecl * td = std::get<1>(p);
+                for ( Type * t : *tupleType ) {
                         newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
-                        if ( env ) {
-                                // add bindings to the type environment.
-                                // xxx - This may not be sufficient, it may be necessary to rename type variables on StructInstType?
-                                env->add( td->get_name(), t->clone() );
-                        }
                 }
                 delete tupleType;