Changeset a5a71d0 for src/InitTweak

Timestamp:

Apr 6, 2016, 5:11:32 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:

eab39cd

Parents:

39786813 (diff), 3aba311 (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 'fix-memory-error' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Makefile.in
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/TypeData.cc
src/Parser/parser.cc
src/Parser/parser.yy
src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc
src/SynTree/Declaration.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/prelude.cf

File:

• src/InitTweak/RemoveInit.cc (modified) (3 diffs)

src/InitTweak/RemoveInit.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Mar 30 15:45:12 2016
+// Last Modified On : Mon Apr 04 17:18:03 2016
 // Update Count     : 166
 //
@@ -68 +68 @@
                 virtual Declaration* mutate( UnionDecl *aggregateDecl );
                 virtual Declaration* mutate( EnumDecl *aggregateDecl );
-                virtual Declaration* mutate( ContextDecl *aggregateDecl );
+                virtual Declaration* mutate( TraitDecl *aggregateDecl );
                 virtual TypeDecl* mutate( TypeDecl *typeDecl );
                 virtual Declaration* mutate( TypedefDecl *typeDecl );
@@ -251 +251 @@
         Declaration* CtorDtor::mutate( UnionDecl *aggregateDecl ) { return aggregateDecl; }
         Declaration* CtorDtor::mutate( EnumDecl *aggregateDecl ) { return aggregateDecl; }
-        Declaration* CtorDtor::mutate( ContextDecl *aggregateDecl ) { return aggregateDecl; }
+        Declaration* CtorDtor::mutate( TraitDecl *aggregateDecl ) { return aggregateDecl; }
         TypeDecl* CtorDtor::mutate( TypeDecl *typeDecl ) { return typeDecl; }
         Declaration* CtorDtor::mutate( TypedefDecl *typeDecl ) { return typeDecl; }