Changes in src/SymTab/Validate.cc [c0aa336:dbe8f244]

File:

• src/SymTab/Validate.cc (modified) (13 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 Feb  2 17:47:54 2017
-// Update Count     : 312
+// Last Modified On : Tue Jul 12 17:49:21 2016
+// Update Count     : 298
 //
 
@@ -67 +67 @@
 namespace SymTab {
         class HoistStruct final : public Visitor {
-                template< typename Visitor >
-                friend void acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
-            template< typename Visitor >
-            friend void addVisitStatementList( std::list< Statement* > &stmts, Visitor &visitor );
           public:
                 /// Flattens nested struct types
@@ -77 +73 @@
                 std::list< Declaration * > &get_declsToAdd() { return declsToAdd; }
 
-                virtual void visit( EnumInstType *enumInstType );
-                virtual void visit( StructInstType *structInstType );
-                virtual void visit( UnionInstType *unionInstType );
                 virtual void visit( StructDecl *aggregateDecl );
                 virtual void visit( UnionDecl *aggregateDecl );
@@ -90 +83 @@
                 template< typename AggDecl > void handleAggregate( AggDecl *aggregateDecl );
 
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
+                std::list< Declaration * > declsToAdd;
                 bool inStruct;
         };
@@ -122 +115 @@
           private:
                 using Parent::visit;
-                void visit( EnumInstType *enumInst ) final;
                 void visit( StructInstType *structInst ) final;
                 void visit( UnionInstType *unionInst ) final;
                 void visit( TraitInstType *contextInst ) final;
-                void visit( EnumDecl *enumDecl ) final;
                 void visit( StructDecl *structDecl ) final;
                 void visit( UnionDecl *unionDecl ) final;
@@ -133 +124 @@
                 const Indexer *indexer;
 
-                typedef std::map< std::string, std::list< EnumInstType * > > ForwardEnumsType;
                 typedef std::map< std::string, std::list< StructInstType * > > ForwardStructsType;
                 typedef std::map< std::string, std::list< UnionInstType * > > ForwardUnionsType;
-                ForwardEnumsType forwardEnums;
                 ForwardStructsType forwardStructs;
                 ForwardUnionsType forwardUnions;
@@ -247 +236 @@
         void HoistStruct::hoistStruct( std::list< Declaration * > &translationUnit ) {
                 HoistStruct hoister;
-                acceptAndAdd( translationUnit, hoister );
+                acceptAndAdd( translationUnit, hoister, true );
         }
 
@@ -271 +260 @@
                 return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl );
         }
-
+        // xxx - shouldn't this be declsToAddBefore?
         template< typename AggDecl >
         void HoistStruct::handleAggregate( AggDecl *aggregateDecl ) {
@@ -287 +276 @@
         }
 
-        void HoistStruct::visit( EnumInstType *structInstType ) {
-                if ( structInstType->get_baseEnum() ) {
-                        declsToAdd.push_front( structInstType->get_baseEnum() );
-                }
-        }
-
-        void HoistStruct::visit( StructInstType *structInstType ) {
-                if ( structInstType->get_baseStruct() ) {
-                        declsToAdd.push_front( structInstType->get_baseStruct() );
-                }
-        }
-
-        void HoistStruct::visit( UnionInstType *structInstType ) {
-                if ( structInstType->get_baseUnion() ) {
-                        declsToAdd.push_front( structInstType->get_baseUnion() );
-                }
-        }
-
         void HoistStruct::visit( StructDecl *aggregateDecl ) {
                 handleAggregate( aggregateDecl );
@@ -326 +297 @@
                         ObjectDecl * obj = dynamic_cast< ObjectDecl * >( *i );
                         assert( obj );
-                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false ), enumDecl->get_name() ) );
+                        obj->set_type( new EnumInstType( Type::Qualifiers( true, false, false, false, false, false ), enumDecl->get_name() ) );
                 } // for
                 Parent::visit( enumDecl );
@@ -378 +349 @@
         }
 
-        void LinkReferenceToTypes::visit( EnumInstType *enumInst ) {
-                Parent::visit( enumInst );
-                EnumDecl *st = indexer->lookupEnum( enumInst->get_name() );
-                // it's not a semantic error if the enum is not found, just an implicit forward declaration
-                if ( st ) {
-                        //assert( ! enumInst->get_baseEnum() || enumInst->get_baseEnum()->get_members().empty() || ! st->get_members().empty() );
-                        enumInst->set_baseEnum( st );
-                } // if
-                if ( ! st || st->get_members().empty() ) {
-                        // use of forward declaration
-                        forwardEnums[ enumInst->get_name() ].push_back( enumInst );
-                } // if
-        }
-
         void LinkReferenceToTypes::visit( StructInstType *structInst ) {
                 Parent::visit( structInst );
@@ -462 +419 @@
                         }
                 }
-        }
-
-        void LinkReferenceToTypes::visit( EnumDecl *enumDecl ) {
-                // visit enum members first so that the types of self-referencing members are updated properly
-                Parent::visit( enumDecl );
-                if ( ! enumDecl->get_members().empty() ) {
-                        ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->get_name() );
-                        if ( fwds != forwardEnums.end() ) {
-                                for ( std::list< EnumInstType * >::iterator inst = fwds->second.begin(); inst != fwds->second.end(); ++inst ) {
-                                        (*inst )->set_baseEnum( enumDecl );
-                                } // for
-                                forwardEnums.erase( fwds );
-                        } // if
-                } // if
         }
 
@@ -696 +639 @@
                         FunctionDecl * newDecl = new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn(), objDecl->get_attributes() );
                         objDecl->get_attributes().clear();
+                        objDecl->set_type( nullptr );
                         delete objDecl;
                         return newDecl;