Changes in src/GenPoly/Box.cc [2a7b3ca:fea3faa]

File:

• src/GenPoly/Box.cc (modified) (7 diffs)

src/GenPoly/Box.cc

@@ -202 +202 @@
                 };
 
-                /// Replaces initialization of polymorphic values with alloca, declaration of dtype/ftype with appropriate void expression, and sizeof expressions of polymorphic types with the proper variable
+                /// Replaces initialization of polymorphic values with alloca, declaration of dtype/ftype with appropriate void expression, sizeof expressions of polymorphic types with the proper variable, and strips fields from generic struct declarations.
                 class Pass3 final : public PolyMutator {
                   public:
@@ -210 +210 @@
                         using PolyMutator::mutate;
                         virtual DeclarationWithType *mutate( FunctionDecl *functionDecl ) override;
+                        virtual Declaration *mutate( StructDecl *structDecl ) override;
+                        virtual Declaration *mutate( UnionDecl *unionDecl ) override;
                         virtual ObjectDecl *mutate( ObjectDecl *objectDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *objectDecl ) override;
@@ -504 +506 @@
                 DeclarationWithType *Pass1::mutate( FunctionDecl *functionDecl ) {
                         if ( functionDecl->get_statements() ) {         // empty routine body ?
-                                // std::cerr << "mutating function: " << functionDecl->get_mangleName() << std::endl;
                                 doBeginScope();
                                 scopeTyVars.beginScope();
@@ -549 +550 @@
                                 retval = oldRetval;
                                 doEndScope();
-                                // std::cerr << "end function: " << functionDecl->get_mangleName() << std::endl;
                         } // if
                         return functionDecl;
@@ -1118 +1118 @@
 
                 Expression *Pass1::mutate( ApplicationExpr *appExpr ) {
-                        // std::cerr << "mutate appExpr: " << InitTweak::getFunctionName( appExpr ) << std::endl;
+                        // std::cerr << "mutate appExpr: ";
                         // for ( TyVarMap::iterator i = scopeTyVars.begin(); i != scopeTyVars.end(); ++i ) {
                         //      std::cerr << i->first << " ";
@@ -1143 +1143 @@
                         ReferenceToType *dynRetType = isDynRet( function, exprTyVars );
 
-                        // std::cerr << function << std::endl;
-                        // std::cerr << "scopeTyVars: ";
-                        // printTyVarMap( std::cerr, scopeTyVars );
-                        // std::cerr << "exprTyVars: ";
-                        // printTyVarMap( std::cerr, exprTyVars );
-                        // std::cerr << "env: " << *env << std::endl;
-                        // std::cerr << needsAdapter( function, scopeTyVars ) << ! needsAdapter( function, exprTyVars) << std::endl;
-
                         // NOTE: addDynRetParam needs to know the actual (generated) return type so it can make a temp variable, so pass the result type from the appExpr
                         // passTypeVars needs to know the program-text return type (i.e. the distinction between _conc_T30 and T3(int))
                         // concRetType may not be a good name in one or both of these places. A more appropriate name change is welcome.
                         if ( dynRetType ) {
-                                // std::cerr << "dynRetType: " << dynRetType << std::endl;
                                 Type *concRetType = appExpr->get_result()->isVoid() ? nullptr : appExpr->get_result();
                                 ret = addDynRetParam( appExpr, concRetType, arg ); // xxx - used to use dynRetType instead of concRetType
@@ -1868 +1859 @@
                 }
 
+                /// Strips the members from a generic aggregate
+                void stripGenericMembers(AggregateDecl* decl) {
+                        if ( ! decl->get_parameters().empty() ) decl->get_members().clear();
+                }
+
+                Declaration *Pass3::mutate( StructDecl *structDecl ) {
+                        stripGenericMembers( structDecl );
+                        return structDecl;
+                }
+                
+                Declaration *Pass3::mutate( UnionDecl *unionDecl ) {
+                        stripGenericMembers( unionDecl );
+                        return unionDecl;
+                }
+
                 TypeDecl * Pass3::mutate( TypeDecl *typeDecl ) {
 //   Initializer *init = 0;