Changes in src/GenPoly/Box.cc [d18540f:474a170]

File:

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

src/GenPoly/Box.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec 19 16:36:00 2022
-// Update Count     : 348
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:40:34 2019
+// Update Count     : 347
 //
 
@@ -214 +214 @@
                 /// sizeof expressions of polymorphic types with the proper variable,
                 /// and strips fields from generic struct declarations.
-                struct Pass3 final {
+                struct Pass3 final : public BoxPass, public WithGuards {
+                        template< typename DeclClass >
+                        void handleDecl( DeclClass * decl, Type * type );
+
                         void premutate( ObjectDecl * objectDecl );
                         void premutate( FunctionDecl * functionDecl );
@@ -220 +223 @@
                         void premutate( StructDecl * structDecl );
                         void premutate( UnionDecl * unionDecl );
+                        void premutate( TypeDecl * typeDecl );
+                        void premutate( PointerType * pointerType );
+                        void premutate( FunctionType * funcType );
                 };
         } // anonymous namespace
@@ -1880 +1886 @@
 ////////////////////////////////////////// Pass3 ////////////////////////////////////////////////////
 
+                template< typename DeclClass >
+                void Pass3::handleDecl( DeclClass * decl, Type * type ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( type, scopeTyVars );
+                        ScrubTyVars::scrubAll( decl );
+                }
+
                 void Pass3::premutate( ObjectDecl * objectDecl ) {
-                        ScrubTyVars::scrubAll( objectDecl );
+                        handleDecl( objectDecl, objectDecl->type );
                 }
 
                 void Pass3::premutate( FunctionDecl * functionDecl ) {
-                        ScrubTyVars::scrubAll( functionDecl );
+                        handleDecl( functionDecl, functionDecl->type );
                 }
 
                 void Pass3::premutate( TypedefDecl * typedefDecl ) {
-                        ScrubTyVars::scrubAll( typedefDecl );
+                        handleDecl( typedefDecl, typedefDecl->base );
                 }
 
                 /// Strips the members from a generic aggregate
-                static void stripGenericMembers( AggregateDecl * decl ) {
+                void stripGenericMembers(AggregateDecl * decl) {
                         if ( ! decl->parameters.empty() ) decl->members.clear();
                 }
@@ -1903 +1916 @@
                 void Pass3::premutate( UnionDecl * unionDecl ) {
                         stripGenericMembers( unionDecl );
+                }
+
+                void Pass3::premutate( TypeDecl * typeDecl ) {
+                        addToTyVarMap( typeDecl, scopeTyVars );
+                }
+
+                void Pass3::premutate( PointerType * pointerType ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( pointerType, scopeTyVars );
+                }
+
+                void Pass3::premutate( FunctionType * functionType ) {
+                        GuardScope( scopeTyVars );
+                        makeTyVarMap( functionType, scopeTyVars );
                 }
         } // anonymous namespace
@@ -1912 +1939 @@
 // compile-command: "make install" //
 // End: //
+