Changes in src/SymTab/Validate.cc [73737e5:51b986f]

File:

• src/SymTab/Validate.cc (modified) (11 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 22 13:16:00 2015
+// Update Count     : 194
 //
 
@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-          EliminateTypedef() : scopeLevel( 0 ) {}
-            /// Replaces typedefs by forward declarations
+                EliminateTypedef() : scopeLevel( 0 ) {}
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -169 +168 @@
                 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 );
@@ -203 +202 @@
         void validateType( Type *type, const Indexer *indexer ) {
                 Pass1 pass1;
+                Pass2 pass2( false, indexer );
                 Pass3 pass3( indexer );
                 type->accept( pass1 );
+                type->accept( pass2 );
                 type->accept( pass3 );
         }
@@ -403 +404 @@
                         } // 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() ) );
         }
@@ -534 +540 @@
                 init->get_args().push_back( new NameExpr( "0" ) );
                 Statement *initStmt = new ExprStmt( noLabels, init );
-  
+                std::list<Statement *> initList;
+                initList.push_back( initStmt );
+
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -559 +567 @@
                 assignExpr->get_args().push_back( srcIndex );
   
-                *out++ = new ForStmt( noLabels, initStmt, cond, inc, new ExprStmt( noLabels, assignExpr ) );
+                *out++ = new ForStmt( noLabels, initList, cond, inc, new ExprStmt( noLabels, assignExpr ) );
         }
 
@@ -609 +617 @@
 
                 // 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() );
@@ -827 +835 @@
                                 rtt->get_parameters().clear();
                                 cloneAll(typeInst->get_parameters(), rtt->get_parameters());
-                        }
+                        } // if
                         delete typeInst;
                         return ret;
@@ -881 +889 @@
         }
 
-        ObjectDecl *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
+        DeclarationWithType *EliminateTypedef::mutate( ObjectDecl * objDecl ) {
                 TypedefMap oldNames = typedefNames;
-                ObjectDecl *ret = Mutator::mutate( objDecl );
+                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
                 typedefNames = oldNames;
                 return ret;
@@ -947 +960 @@
         }
 
-                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );