Changes in src/GenPoly/Box.cc [1ba88a0:f18a711]

File:

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

src/GenPoly/Box.cc

@@ -158 +158 @@
                 class PolyGenericCalculator : public PolyMutator {
                 public:
-                        typedef PolyMutator Parent;
-                        using Parent::mutate;
-
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
@@ -1678 +1675 @@
                 DeclClass * PolyGenericCalculator::handleDecl( DeclClass *decl, Type *type ) {
                         beginTypeScope( type );
-                        // knownLayouts.beginScope();
-                        // knownOffsets.beginScope();
-
-                        DeclClass *ret = static_cast< DeclClass *>( Parent::mutate( decl ) );
-
-                        // knownOffsets.endScope();
-                        // knownLayouts.endScope();
+                        knownLayouts.beginScope();
+                        knownOffsets.beginScope();
+
+                        DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
+
+                        knownOffsets.endScope();
+                        knownLayouts.endScope();
                         endTypeScope();
                         return ret;
@@ -1694 +1691 @@
 
                 DeclarationWithType * PolyGenericCalculator::mutate( FunctionDecl *functionDecl ) {
-                        knownLayouts.beginScope();
-                        knownOffsets.beginScope();
-
-                        DeclarationWithType * decl = handleDecl( functionDecl, functionDecl->get_functionType() );
-                        knownOffsets.endScope();
-                        knownLayouts.endScope();
-                        return decl;
+                        return handleDecl( functionDecl, functionDecl->get_functionType() );
                 }
 
@@ -1709 +1700 @@
                 TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
                         scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
-                        return Parent::mutate( typeDecl );
+                        return Mutator::mutate( typeDecl );
                 }
 
@@ -1715 +1706 @@
                         beginTypeScope( pointerType );
 
-                        Type *ret = Parent::mutate( pointerType );
+                        Type *ret = Mutator::mutate( pointerType );
 
                         endTypeScope();
@@ -1733 +1724 @@
                         }
 
-                        Type *ret = Parent::mutate( funcType );
+                        Type *ret = Mutator::mutate( funcType );
 
                         endTypeScope();
@@ -1754 +1745 @@
                                 }
                         }
-                        return Parent::mutate( declStmt );
+                        return Mutator::mutate( declStmt );
                 }
 
@@ -1796 +1787 @@
                 Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
                         // mutate, exiting early if no longer MemberExpr
-                        Expression *expr = Parent::mutate( memberExpr );
+                        Expression *expr = Mutator::mutate( memberExpr );
                         memberExpr = dynamic_cast< MemberExpr* >( expr );
                         if ( ! memberExpr ) return expr;
@@ -1981 +1972 @@
                 Expression *PolyGenericCalculator::mutate( OffsetofExpr *offsetofExpr ) {
                         // mutate, exiting early if no longer OffsetofExpr
-                        Expression *expr = Parent::mutate( offsetofExpr );
+                        Expression *expr = Mutator::mutate( offsetofExpr );
                         offsetofExpr = dynamic_cast< OffsetofExpr* >( expr );
                         if ( ! offsetofExpr ) return expr;