Changes in src/SymTab/Validate.cc [85c4ef0:0215a76f]

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 13 14:38:19 2015
-// Update Count     : 184
+// Last Modified On : Wed Jul 08 12:49:36 2015
+// Update Count     : 166
 //
 
@@ -60 +60 @@
         class HoistStruct : public Visitor {
           public:
+                /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
   
@@ -84 +85 @@
         };
 
+        /// Replaces enum types by int, and function or array types in function parameter and return lists by appropriate pointers
         class Pass1 : public Visitor {
                 typedef Visitor Parent;
@@ -89 +91 @@
                 virtual void visit( FunctionType *func );
         };
-  
+
+        /// Associates forward declarations of aggregates with their definitions
         class Pass2 : public Indexer {
                 typedef Indexer Parent;
@@ -110 +113 @@
         };
 
+        /// Replaces array and function types in forall lists by appropriate pointer type
         class Pass3 : public Indexer {
                 typedef Indexer Parent;
@@ -123 +127 @@
         class AddStructAssignment : public Visitor {
           public:
+                /// Generates assignment operators for aggregate types as required
                 static void addStructAssignment( std::list< Declaration * > &translationUnit );
 
@@ -167 +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;
@@ -444 +441 @@
         }
 
+        /// Fix up assertions
         void forallFixer( Type *func ) {
-                // Fix up assertions
                 for ( std::list< TypeDecl * >::iterator type = func->get_forall().begin(); type != func->get_forall().end(); ++type ) {
                         std::list< DeclarationWithType * > toBeDone, nextRound;
@@ -808 +805 @@
         }
 
-        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.
@@ -815 +812 @@
                         Type *ret = def->second.first->get_base()->clone();
                         ret->get_qualifiers() += typeInst->get_qualifiers();
+                        // place instance parameters on the typedef'd type
+                        if ( ! typeInst->get_parameters().empty() ) {
+                                ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
+                                if ( ! rtt ) {
+                                        throw SemanticError("cannot apply type parameters to base type of " + typeInst->get_name());
+                                }
+                                rtt->get_parameters().clear();
+                                cloneAll(typeInst->get_parameters(), rtt->get_parameters());
+                        }
                         delete typeInst;
                         return ret;
@@ -821 +827 @@
         }
 
-        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 ) {
@@ -831 +837 @@
                         if ( ! typeEquals( t1, t2, true ) ) {
                                 throw SemanticError( "cannot redefine typedef: " + tyDecl->get_name() );
-                        }
+                        } 
                 } else {
                         typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
@@ -853 +859 @@
         }
 
-        TypeDecl *EliminateTypedef::mutate( TypeDecl * typeDecl ) {
+        TypeDecl *EliminateTypedef::mutate( TypeDecl *typeDecl ) {
                 TypedefMap::iterator i = typedefNames.find( typeDecl->get_name() );
                 if ( i != typedefNames.end() ) {
@@ -861 +867 @@
         }
 
-        DeclarationWithType *EliminateTypedef::mutate( FunctionDecl * funcDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( FunctionDecl *funcDecl ) {
                 TypedefMap oldNames = typedefNames;
                 DeclarationWithType *ret = Mutator::mutate( funcDecl );
@@ -868 +874 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        ObjectDecl *EliminateTypedef::mutate( ObjectDecl *objDecl ) {
                 TypedefMap oldNames = typedefNames;
                 ObjectDecl *ret = Mutator::mutate( objDecl );
@@ -875 +881 @@
         }
 
-        Expression *EliminateTypedef::mutate( CastExpr * castExpr ) {
+        Expression *EliminateTypedef::mutate( CastExpr *castExpr ) {
                 TypedefMap oldNames = typedefNames;
                 Expression *ret = Mutator::mutate( castExpr );
@@ -882 +888 @@
         }
 
-        CompoundStmt *EliminateTypedef::mutate( CompoundStmt * compoundStmt ) {
+        CompoundStmt *EliminateTypedef::mutate( CompoundStmt *compoundStmt ) {
                 TypedefMap oldNames = typedefNames;
                 scopeLevel += 1;
@@ -889 +895 @@
                 std::list< Statement * >::iterator i = compoundStmt->get_kids().begin();
                 while ( i != compoundStmt->get_kids().end() ) {
-                        std::list< Statement * >::iterator next = i+1;
+                        std::list< Statement * >::iterator next = i;
+                        ++next;
                         if ( DeclStmt *declStmt = dynamic_cast< DeclStmt * >( *i ) ) {
                                 if ( dynamic_cast< TypedefDecl * >( declStmt->get_decl() ) ) {
@@ -901 +908 @@
                 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