Changes in src/SymTab/Validate.cc [1db21619:145f1fc]

File:

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

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 16 16:10:02 2015
-// Update Count     : 189
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:27:54 2015
+// Update Count     : 186
 //
 
@@ -60 +60 @@
         class HoistStruct : public Visitor {
           public:
-                /// Flattens nested struct types
                 static void hoistStruct( std::list< Declaration * > &translationUnit );
   
@@ -85 +84 @@
         };
 
-        /// 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;
@@ -91 +89 @@
                 virtual void visit( FunctionType *func );
         };
-
-        /// Associates forward declarations of aggregates with their definitions
+  
         class Pass2 : public Indexer {
                 typedef Indexer Parent;
@@ -113 +110 @@
         };
 
-        /// Replaces array and function types in forall lists by appropriate pointer type
         class Pass3 : public Indexer {
                 typedef Indexer Parent;
@@ -127 +123 @@
         class AddStructAssignment : public Visitor {
           public:
-                /// Generates assignment operators for aggregate types as required
                 static void addStructAssignment( std::list< Declaration * > &translationUnit );
 
@@ -162 +157 @@
         class EliminateTypedef : public Mutator {
           public:
-                EliminateTypedef() : scopeLevel( 0 ) {}
+          EliminateTypedef() : scopeLevel( 0 ) {}
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -168 +163 @@
                 virtual TypeDecl *mutate( TypeDecl *typeDecl );
                 virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
+                virtual ObjectDecl *mutate( ObjectDecl *objDecl );
                 virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
                 virtual Type *mutate( TypeInstType *aggregateUseType );
@@ -449 +444 @@
         }
 
-        /// 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;
@@ -612 +607 @@
 
                 // need to remove the prototypes, since this may be nested in a routine
-                for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
+                for (int start = 0, end = assigns.size()/2; start < end; start++) {
                         delete assigns.front();
                         assigns.pop_front();
-                } // for
+                }
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -822 +817 @@
                         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());
-                        } // if
                         delete typeInst;
                         return ret;
@@ -884 +870 @@
         }
 
-        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                DeclarationWithType *ret = Mutator::mutate( objDecl );
-                if ( FunctionType *funtype = dynamic_cast<FunctionType *>( ret->get_type() ) ) {
-                        return new FunctionDecl( ret->get_name(), ret->get_storageClass(), ret->get_linkage(), funtype, 0, ret->get_isInline(), ret->get_isNoreturn() );
-                } else if ( objDecl->get_isInline() || objDecl->get_isNoreturn() ) {
-                        throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
-                } // if
+                ObjectDecl *ret = Mutator::mutate( objDecl );
                 typedefNames = oldNames;
                 return ret;
@@ -955 +936 @@
         }
 
-        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );