Changes in src/GenPoly/ScrubTyVars.h [5a3ac84:3bb195cb]

File:

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

src/GenPoly/ScrubTyVars.h

@@ -26 +26 @@
 namespace GenPoly {
         class ScrubTyVars : public Mutator {
-                /// Whether to scrub all type variables from the provided map, dynamic type variables from the provided map, or all type variables
-                enum ScrubMode { FromMap, DynamicFromMap, All };
+          public:
+                ScrubTyVars( const TyVarMap &tyVars, bool dynamicOnly = false ): tyVars( tyVars ), dynamicOnly( dynamicOnly ) {}
 
-                ScrubTyVars() : tyVars(nullptr), mode( All ) {}
-
-                ScrubTyVars( const TyVarMap &tyVars, ScrubMode mode = FromMap ): tyVars( &tyVars ), mode( mode ) {}
-
-        public:
                 /// 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
@@ -43 +38 @@
                 template< typename SynTreeClass >
                 static SynTreeClass *scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars );
-
-                /// For all polymorphic types, replaces generic types, dtypes, and ftypes with the appropriate void type,
-                /// and sizeof/alignof expressions with the proper variable
-                template< typename SynTreeClass >
-                static SynTreeClass *scrubAll( SynTreeClass *target );
 
                 virtual Type* mutate( TypeInstType *typeInst );
@@ -59 +49 @@
                 /// Returns the type if it should be scrubbed, NULL otherwise.
                 Type* shouldScrub( Type *ty ) {
-                        switch ( mode ) {
-                        case FromMap: return isPolyType( ty, *tyVars );
-                        case DynamicFromMap: return isDynType( ty, *tyVars );
-                        case All: return isPolyType( ty );
-                        }
-                        assert(false); return nullptr; // unreachable
-                        // return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
+                        return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
+//                      if ( ! dynamicOnly ) return isPolyType( ty, tyVars );
+// 
+//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( ty ) ) {
+//                              return tyVars.find( typeInst->get_name() ) != tyVars.end() ? ty : 0;
+//                      }
+// 
+//                      return isDynType( ty, tyVars );
                 }
                 
@@ -71 +62 @@
                 Type* mutateAggregateType( Type *ty );
                 
-                const TyVarMap *tyVars;  ///< Type variables to scrub
-                ScrubMode mode;          ///< which type variables to scrub? [FromMap]
+                const TyVarMap &tyVars;  ///< Type variables to scrub
+                bool dynamicOnly;        ///< only scrub the types with dynamic layout? [false]
         };
 
@@ -83 +74 @@
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
-                ScrubTyVars scrubber( tyVars, ScrubTyVars::DynamicFromMap );
-                return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
-        }
-
-        template< typename SynTreeClass >
-        SynTreeClass * ScrubTyVars::scrubAll( SynTreeClass *target ) {
-                ScrubTyVars scrubber;
+                ScrubTyVars scrubber( tyVars, true );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
         }