Changes in / [36874e4:61f9356]

Location:

src/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• ScrubTyVars.cc (modified) (1 diff)
• ScrubTyVars.h (modified) (1 diff)

src/GenPoly/Box.cc

@@ -492 +492 @@
                         assert( arg );
                         if ( isPolyType( realParam->get_type(), tyVars ) ) {
+//     if ( dynamic_cast< PointerType *>( arg->get_type() ) ) {
+//       return new CastExpr( new VariableExpr( param ), arg->get_type()->clone() );
+//     } else {
                                 if ( dynamic_cast<TypeInstType *>(arg->get_type()) == NULL ) {
                                         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
@@ -498 +501 @@
                                         return deref;
                                 } // if
+//     }
                         } // if
                         return new VariableExpr( param );
@@ -1032 +1036 @@
 
                         // add size/align for generic types to parameter list
-                        std::set< std::string > seenTypes; // sizeofName for generic types we've seen
+                        std::set< std::string > seenTypes; //< sizeofName for generic types we've seen
                         for ( std::list< DeclarationWithType* >::const_iterator fnParm = last; fnParm != funcType->get_parameters().end(); ++fnParm ) {
                                 Type *parmType = (*fnParm)->get_type();

src/GenPoly/ScrubTyVars.cc

@@ -44 +44 @@
         }
 
-        Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
-                if ( doAll ? isPolyType( ty ) : isPolyType( ty, tyVars ) ) {
-                        PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
-                        delete ty;
-                        return ret;
-                }
-                return ty;
-        }
-        
-        Type * ScrubTyVars::mutate( StructInstType *structInst ) {
-                return mutateAggregateType( structInst );
-        }
-
-        Type * ScrubTyVars::mutate( UnionInstType *unionInst ) {
-                return mutateAggregateType( unionInst );
-        }
-
         Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T

src/GenPoly/ScrubTyVars.h

@@ -35 +35 @@
                 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 );
+                Expression* mutate( AlignofExpr *algnof );
                 virtual Type* mutate( PointerType *pointer );
-
           private:
-                /// Mutates (possibly generic) aggregate types appropriately
-                Type* mutateAggregateType( Type *ty );
-                
                 bool doAll;
                 const TyVarMap &tyVars;