Changeset 353d168 for src/SymTab/Validate.cc

Timestamp:

Aug 19, 2015, 3:59:45 PM (9 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, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

File:

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

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 22 13:16:00 2015
-// Update Count     : 194
+// Last Modified On : Wed Aug 05 14:00:24 2015
+// Update Count     : 195
 //
 
@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-                EliminateTypedef() : scopeLevel( 0 ) {}
+          EliminateTypedef() : scopeLevel( 0 ) {}
+            /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -542 +543 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-
+  
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -617 +618 @@
 
                 // 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();
@@ -892 +893 @@
                 TypedefMap oldNames = typedefNames;
                 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() );
@@ -897 +899 @@
                         throw SemanticError( "invalid inline or _Noreturn specification in declaration of ", objDecl );
                 } // if
-                typedefNames = oldNames;
                 return ret;
         }
@@ -960 +961 @@
         }
 
-        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );