Changeset 9163b9c

Timestamp:

Jul 14, 2015, 11:31:54 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

34e3732, 724c2b6

Parents:

0215a76f (diff), dfee306 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Validate.cc (modified) (12 diffs)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 08 12:49:36 2015
-// Update Count     : 166
+// Last Modified On : Mon Jul 13 14:38:19 2015
+// Update Count     : 184
 //
 
@@ -172 +172 @@
                 virtual Type *mutate( TypeInstType *aggregateUseType );
                 virtual Expression *mutate( CastExpr *castExpr );
+
+                virtual Declaration *mutate( StructDecl * structDecl );
+                virtual Declaration *mutate( UnionDecl * unionDecl );
+                virtual Declaration *mutate( EnumDecl * enumDecl );
+                virtual Declaration *mutate( ContextDecl * contextDecl );
+
+                template<typename AggDecl>
+                AggDecl *handleAggregate( AggDecl * aggDecl );
 
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
@@ -805 +813 @@
         }
 
-        Type *EliminateTypedef::mutate( TypeInstType *typeInst ) {
+        Type *EliminateTypedef::mutate( TypeInstType * typeInst ) {
                 // instances of typedef types will come here. If it is an instance 
                 // of a typdef type, link the instance to its actual type.
@@ -827 +835 @@
         }
 
-        Declaration *EliminateTypedef::mutate( TypedefDecl *tyDecl ) {
+        Declaration *EliminateTypedef::mutate( TypedefDecl * tyDecl ) {
                 Declaration *ret = Mutator::mutate( tyDecl );
                 if ( typedefNames.count( tyDecl->get_name() ) == 1 && typedefNames[ tyDecl->get_name() ].second == scopeLevel ) {
@@ -837 +845 @@
                         if ( ! typeEquals( t1, t2, true ) ) {
                                 throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
-                        } 
+                        }
                 } else {
                         typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
@@ -859 +867 @@
         }
 
-        TypeDecl *EliminateTypedef::mutate( TypeDecl *typeDecl ) {
+        TypeDecl *EliminateTypedef::mutate( TypeDecl * typeDecl ) {
                 TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
                 if ( i != typedefNames.end() ) {
@@ -867 +875 @@
         }
 
-        DeclarationWithType *EliminateTypedef::mutate( FunctionDecl *funcDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
                 TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
@@ -874 +882 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl *objDecl ) {
+        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
                 ObjectDecl *ret = Mutator::mutate( objDecl );
@@ -881 +889 @@
         }
 
-        Expression *EliminateTypedef::mutate( CastExpr *castExpr ) {
+        Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
                 TypedefMap oldNames = typedefNames;
                 Expression *ret = Mutator::mutate( castExpr );
@@ -888 +896 @@
         }
 
-        CompoundStmt *EliminateTypedef::mutate( CompoundStmt *compoundStmt ) {
+        CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
                 TypedefMap oldNames = typedefNames;
                 scopeLevel += 1;
@@ -895 +903 @@
                 std::list< Statement * >::iterator i = compoundStmt->get_kids().begin();
                 while ( i != compoundStmt->get_kids().end() ) {
-                        std::list< Statement * >::iterator next = i;
-                        ++next;
+                        std::list< Statement * >::iterator next = i+1;
                         if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( *i ) ) {
                                 if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
@@ -908 +915 @@
                 return ret;
         }
+
+        // there may be typedefs nested within aggregates
+        // in order for everything to work properly, these
+        // should be removed as well
+        template<typename AggDecl>
+        AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
+                std::list<Declaration *>::iterator it = aggDecl->get_members().begin();
+                for ( ; it != aggDecl->get_members().end(); ) {
+                        std::list< Declaration * >::iterator next = it+1;
+                        if ( dynamic_cast< TypedefDecl * >( *it ) ) {
+                                delete *it;
+                                aggDecl->get_members().erase( it );
+                        } // if
+                        it = next;
+                }
+                return aggDecl;
+        }
+
+        Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
+                Mutator::mutate( structDecl );
+                return handleAggregate( structDecl );
+        }
+
+        Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
+                Mutator::mutate( unionDecl );
+                return handleAggregate( unionDecl );
+        }
+
+        Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
+                Mutator::mutate( enumDecl );
+                return handleAggregate( enumDecl );
+        }
+
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Mutator::mutate( contextDecl );
+                return handleAggregate( contextDecl );
+        }
+
 } // namespace SymTab