Changeset a5a71d0 for src/SynTree/Declaration.h

Timestamp:

Apr 6, 2016, 5:11:32 PM (8 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/SynTree/Declaration.h (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 16:11:49 2016
+// Last Modified On : Mon Apr 04 17:14:00 2016
 // Update Count     : 36
 //
@@ -246 +246 @@
 };
 
-class ContextDecl : public AggregateDecl {
-        typedef AggregateDecl Parent;
-  public:
-        ContextDecl( const std::string &name ) : Parent( name ) {}
-        ContextDecl( const ContextDecl &other ) : Parent( other ) {}
-
-        virtual ContextDecl *clone() const { return new ContextDecl( *this ); }
+class TraitDecl : public AggregateDecl {
+        typedef AggregateDecl Parent;
+  public:
+        TraitDecl( const std::string &name ) : Parent( name ) {}
+        TraitDecl( const TraitDecl &other ) : Parent( other ) {}
+
+        virtual TraitDecl *clone() const { return new TraitDecl( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }