Changeset 45161b4d for src/SymTab

Timestamp:

Apr 13, 2016, 5:08:56 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

b11fac4

Parents:

3849857

Message:

generate implicit typedef right after sue name appears, further fixes storage allocation routines and comments

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr  7 16:45:30 2016
-// Update Count     : 243
+// Last Modified On : Wed Apr 13 16:39:30 2016
+// Update Count     : 251
 //
 
@@ -190 +190 @@
                 AggDecl *handleAggregate( AggDecl * aggDecl );
 
+                template<typename AggDecl>
+                void addImplicitTypedef( AggDecl * aggDecl );
+                
                 typedef std::map< std::string, std::pair< TypedefDecl *, int > > TypedefMap;
                 TypedefMap typedefNames;
@@ -1014 +1017 @@
         }
 
-        // there may be typedefs nested within aggregates
-        // in order for everything to work properly, these
-        // should be removed as well
+        // 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 ) {
@@ -1030 +1032 @@
                 return aggDecl;
         }
-
+        
+        template<typename AggDecl>
+        void EliminateTypedef::addImplicitTypedef( AggDecl * aggDecl ) {
+                if ( typedefNames.count( aggDecl->get_name() ) == 0 ) {
+                        Type *type;
+                        if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( aggDecl ) ) {
+                                type = new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() );
+                        } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( aggDecl ) ) {
+                                type = new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() );
+                        } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( aggDecl )  ) {
+                                type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
+                        } // if
+                        TypedefDecl * tyDecl = new TypedefDecl( aggDecl->get_name(), DeclarationNode::NoStorageClass, type );
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
+                } // if
+        }
         Declaration *EliminateTypedef::mutate( StructDecl * structDecl ) {
+                addImplicitTypedef( structDecl );
                 Mutator::mutate( structDecl );
                 return handleAggregate( structDecl );
@@ -1037 +1055 @@
 
         Declaration *EliminateTypedef::mutate( UnionDecl * unionDecl ) {
+                addImplicitTypedef( unionDecl );
                 Mutator::mutate( unionDecl );
                 return handleAggregate( unionDecl );
@@ -1042 +1061 @@
 
         Declaration *EliminateTypedef::mutate( EnumDecl * enumDecl ) {
+                addImplicitTypedef( enumDecl );
                 Mutator::mutate( enumDecl );
                 return handleAggregate( enumDecl );
         }
 
-                Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( TraitDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );