Changes in src/GenPoly/ScrubTyVars.h [843054c2:ebe9b3a]

File:

• src/GenPoly/ScrubTyVars.h (modified) (3 diffs)

src/GenPoly/ScrubTyVars.h

@@ -17 +17 @@
 #define _SCRUBTYVARS_H
 
+#include <string>
+
 #include "GenPoly.h"
 
@@ -25 +27 @@
         class ScrubTyVars : public Mutator {
           public:
-                ScrubTyVars( bool doAll, const TyVarMap &tyVars ): doAll( doAll ), tyVars( tyVars ) {}
-  
+                ScrubTyVars( const TyVarMap &tyVars ): tyVars( tyVars ) {}
+
+                /// For all polymorphic types with type variables in `tyVars`, replaces generic types, dtypes, and ftypes with the appropriate void type,
+                /// and sizeof/alignof expressions with the proper variable
                 template< typename SynTreeClass >
                 static SynTreeClass *scrub( SynTreeClass *target, const TyVarMap &tyVars );
-                template< typename SynTreeClass >
-                static SynTreeClass *scrub( SynTreeClass *target );
-  
+
                 virtual Type* mutate( TypeInstType *typeInst );
-                Expression* mutate( SizeofExpr *szeof );
+                virtual Type* mutate( StructInstType *structInst );
+                virtual Type* mutate( UnionInstType *unionInst );
+                virtual Expression* mutate( SizeofExpr *szeof );
+                virtual Expression* mutate( AlignofExpr *algnof );
                 virtual Type* mutate( PointerType *pointer );
+
           private:
-                bool doAll;
+                /// Mutates (possibly generic) aggregate types appropriately
+                Type* mutateAggregateType( Type *ty );
+                
                 const TyVarMap &tyVars;
         };
@@ -43 +51 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( false, tyVars );
+                ScrubTyVars scrubber( tyVars );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }
 
-        /* static class method */
-        template< typename SynTreeClass >
-        SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target ) {
-                TyVarMap tyVars;
-                ScrubTyVars scrubber( true, tyVars );
-                return static_cast< SynTreeClass* >( target->acceptMutator( scrubber ) );
-        }
 } // namespace GenPoly