Changeset d60ccbf for src/SymTab/Validate.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f32c7f4

Parents:

e45215c (diff), e869d663 (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' into designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:27:54 2015
-// Update Count     : 186
+// Last Modified On : Wed Aug 05 14:00:24 2015
+// Update Count     : 195
 //
 
@@ -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 );
 
@@ -158 +163 @@
           public:
           EliminateTypedef() : scopeLevel( 0 ) {}
+            /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -163 +169 @@
                 virtual TypeDecl *mutate( TypeDecl *typeDecl );
                 virtual DeclarationWithType *mutate( FunctionDecl *funcDecl );
-                virtual ObjectDecl *mutate( ObjectDecl *objDecl );
+                virtual DeclarationWithType *mutate( ObjectDecl *objDecl );
                 virtual CompoundStmt *mutate( CompoundStmt *compoundStmt );
                 virtual Type *mutate( TypeInstType *aggregateUseType );
@@ -399 +405 @@
                         } // for
                 } // for
+
+                if ( ctx->get_parameters().size() != contextInst->get_parameters().size() ) {
+                        throw SemanticError( "incorrect number of context parameters: ", contextInst );
+                } // if
+
                 applySubstitution( ctx->get_parameters().begin(), ctx->get_parameters().end(), contextInst->get_parameters().begin(), ctx->get_members().begin(), ctx->get_members().end(), back_inserter( contextInst->get_members() ) );
         }
@@ -444 +455 @@
         }
 
+        /// 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;
@@ -532 +543 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-
+  
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -610 +621 @@
                         delete assigns.front();
                         assigns.pop_front();
-                }
+                } // for
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -817 +828 @@
                         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;
@@ -870 +890 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                ObjectDecl *ret = Mutator::mutate( objDecl );
+                DeclarationWithType *ret = Mutator::mutate( objDecl );
                 typedefNames = oldNames;
+                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
                 return ret;
         }