Changeset ebe9b3a

Timestamp:

Jan 12, 2016, 3:56:30 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

aadc9a4

Parents:

36874e4

Message:

Stripped unused and potentially buggy 'doAll' flag from ScrubTyVars?

Location:

src/GenPoly

Files:

• ScrubTyVars.cc (modified) (3 diffs)
• ScrubTyVars.h (modified) (3 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -27 +27 @@
         Type * ScrubTyVars::mutate( TypeInstType *typeInst ) {
                 TyVarMap::const_iterator tyVar = tyVars.find( typeInst->get_name() );
-                if ( doAll || tyVar != tyVars.end() ) {
+                if ( tyVar != tyVars.end() ) {
                         switch ( tyVar->second ) {
                           case TypeDecl::Any:
@@ -45 +45 @@
 
         Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
-                if ( doAll ? isPolyType( ty ) : isPolyType( ty, tyVars ) ) {
+                if ( isPolyType( ty, tyVars ) ) {
                         PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
                         delete ty;
@@ -83 +83 @@
         Type * ScrubTyVars::mutate( PointerType *pointer ) {
                 if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( pointer->get_base() ) ) {
-                        if ( doAll || tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
+                        if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
                                 Type *ret = mutate( typeInst );
                                 ret->get_qualifiers() += pointer->get_qualifiers();

src/GenPoly/ScrubTyVars.h

@@ -27 +27 @@
         class ScrubTyVars : public Mutator {
           public:
-                ScrubTyVars( bool doAll, const TyVarMap &tyVars ): doAll( doAll ), tyVars( tyVars ) {}
+                ScrubTyVars( const TyVarMap &tyVars ): tyVars( tyVars ) {}
 
-                /// Like scrub( SynTreeClass* ), but only applies to type variables in `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 );
-                /// Replaces dtypes and ftypes with the appropriate void type, and sizeof expressions of polymorphic types with the proper variable
-                template< typename SynTreeClass >
-                static SynTreeClass *scrub( SynTreeClass *target );
 
                 virtual Type* mutate( TypeInstType *typeInst );
@@ -47 +45 @@
                 Type* mutateAggregateType( Type *ty );
                 
-                bool doAll;
                 const TyVarMap &tyVars;
         };
@@ -54 +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