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

File:

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

src/GenPoly/ScrubTyVars.h

@@ -17 +17 @@
 #define _SCRUBTYVARS_H
 
-#include <string>
-
 #include "GenPoly.h"
 
@@ -27 +25 @@
         class ScrubTyVars : public Mutator {
           public:
-                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
+                ScrubTyVars( bool doAll, const TyVarMap &tyVars ): doAll( doAll ), tyVars( tyVars ) {}
+  
                 template< typename SynTreeClass >
                 static SynTreeClass *scrub( SynTreeClass *target, const TyVarMap &tyVars );
-
+                template< typename SynTreeClass >
+                static SynTreeClass *scrub( SynTreeClass *target );
+  
                 virtual Type* mutate( TypeInstType *typeInst );
-                virtual Type* mutate( StructInstType *structInst );
-                virtual Type* mutate( UnionInstType *unionInst );
-                virtual Expression* mutate( SizeofExpr *szeof );
-                virtual Expression* mutate( AlignofExpr *algnof );
+                Expression* mutate( SizeofExpr *szeof );
                 virtual Type* mutate( PointerType *pointer );
-
           private:
-                /// Mutates (possibly generic) aggregate types appropriately
-                Type* mutateAggregateType( Type *ty );
-                
+                bool doAll;
                 const TyVarMap &tyVars;
         };
@@ -51 +43 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( tyVars );
+                ScrubTyVars scrubber( false, 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