Changeset b29f8f3 for src/SymTab

Timestamp:

Jul 29, 2015, 12:07:38 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

093f1a0

Parents:

1e8f143 (diff), 51b986f (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 from origin

Location:

src/SymTab

Files:

• AddVisit.h (modified) (2 diffs)
• TypeEquality.cc (modified) (2 diffs)
• Validate.cc (modified) (9 diffs)

src/SymTab/AddVisit.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:14:32 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 16:16:38 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 14 12:26:17 2015
+// Update Count     : 4
 //
 
@@ -57 +57 @@
         inline void addVisit(ForStmt *forStmt, Visitor &visitor) {
                 addVisitStatement( forStmt->get_body(), visitor );
-                maybeAccept( forStmt->get_initialization(), visitor );
+                acceptAll( forStmt->get_initialization(), visitor );
                 maybeAccept( forStmt->get_condition(), visitor );
                 maybeAccept( forStmt->get_increment(), visitor );

src/SymTab/TypeEquality.cc

@@ -10 +10 @@
 // Created On       : Tue Jul 07 16:28:29 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 09 11:18:46 2015
-// Update Count     : 36
+// Last Modified On : Mon Jul 20 14:16:11 2015
+// Update Count     : 37
 //
 
@@ -91 +91 @@
                         // and must both have a dimension expression or not have a dimension
                         result = result && arrayType->get_isVarLen() == at->get_isVarLen()
-                                && (arrayType->get_dimension() != 0 && at->get_dimension() != 0
-                                        || arrayType->get_dimension() == 0 && at->get_dimension() == 0);
+                                && ((arrayType->get_dimension() != 0 && at->get_dimension() != 0)
+                                        || (arrayType->get_dimension() == 0 && at->get_dimension() == 0));
 
                         if ( vlaErr ) {

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
 //
 
@@ -169 +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 );
@@ -203 +203 @@
         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 +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() ) );
         }
@@ -534 +541 @@
                 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( "?<?" ) );
@@ -559 +568 @@
                 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 ) );
         }
 
@@ -612 +621 @@
                         delete assigns.front();
                         assigns.pop_front();
-                }
+                } // for
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );
@@ -827 +836 @@
                                 rtt->get_parameters().clear();
                                 cloneAll(typeInst->get_parameters(), rtt->get_parameters());
-                        }
+                        } // if
                         delete typeInst;
                         return ret;
@@ -881 +890 @@
         }
 
-        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;