Changeset 1ced874 for src/GenPoly/Box.cc

Timestamp:

Sep 6, 2016, 4:36:29 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e76acbe

Parents:

0362d42 (diff), f04a8b81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into tuples

File:

• src/GenPoly/Box.cc (modified) (8 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 );
@@ -1675 +1678 @@
                 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();
+                        endTypeScope();
+                        return ret;
+                }
+
+                ObjectDecl * PolyGenericCalculator::mutate( ObjectDecl *objectDecl ) {
+                        return handleDecl( objectDecl, objectDecl->get_type() );
+                }
+
+                DeclarationWithType * PolyGenericCalculator::mutate( FunctionDecl *functionDecl ) {
                         knownLayouts.beginScope();
                         knownOffsets.beginScope();
 
-                        DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
-
+                        DeclarationWithType * decl = handleDecl( functionDecl, functionDecl->get_functionType() );
                         knownOffsets.endScope();
                         knownLayouts.endScope();
-                        endTypeScope();
-                        return ret;
-                }
-
-                ObjectDecl * PolyGenericCalculator::mutate( ObjectDecl *objectDecl ) {
-                        return handleDecl( objectDecl, objectDecl->get_type() );
-                }
-
-                DeclarationWithType * PolyGenericCalculator::mutate( FunctionDecl *functionDecl ) {
-                        return handleDecl( functionDecl, functionDecl->get_functionType() );
+                        return decl;
                 }
 
@@ -1700 +1709 @@
                 TypeDecl * PolyGenericCalculator::mutate( TypeDecl *typeDecl ) {
                         scopeTyVars[ typeDecl->get_name() ] = typeDecl->get_kind();
-                        return Mutator::mutate( typeDecl );
+                        return Parent::mutate( typeDecl );
                 }
 
@@ -1706 +1715 @@
                         beginTypeScope( pointerType );
 
-                        Type *ret = Mutator::mutate( pointerType );
+                        Type *ret = Parent::mutate( pointerType );
 
                         endTypeScope();
@@ -1724 +1733 @@
                         }
 
-                        Type *ret = Mutator::mutate( funcType );
+                        Type *ret = Parent::mutate( funcType );
 
                         endTypeScope();
@@ -1745 +1754 @@
                                 }
                         }
-                        return Mutator::mutate( declStmt );
+                        return Parent::mutate( declStmt );
                 }
 
@@ -1787 +1796 @@
                 Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
                         // mutate, exiting early if no longer MemberExpr
-                        Expression *expr = Mutator::mutate( memberExpr );
+                        Expression *expr = Parent::mutate( memberExpr );
                         memberExpr = dynamic_cast< MemberExpr* >( expr );
                         if ( ! memberExpr ) return expr;
@@ -1972 +1981 @@
                 Expression *PolyGenericCalculator::mutate( OffsetofExpr *offsetofExpr ) {
                         // mutate, exiting early if no longer OffsetofExpr
-                        Expression *expr = Mutator::mutate( offsetofExpr );
+                        Expression *expr = Parent::mutate( offsetofExpr );
                         offsetofExpr = dynamic_cast< OffsetofExpr* >( expr );
                         if ( ! offsetofExpr ) return expr;