Changeset a5a71d0 for src/SynTree/Type.h

Timestamp:

Apr 6, 2016, 5:11:32 PM (10 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/Type.h (modified) (3 diffs)

src/SynTree/Type.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Dec 18 14:46:18 2015
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:29:08 2016
+// Update Count     : 21
 //
 
@@ -296 +296 @@
 };
 
-class ContextInstType : public ReferenceToType {
+class TraitInstType : public ReferenceToType {
         typedef ReferenceToType Parent;
   public:
-        ContextInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {}
-        ContextInstType( const ContextInstType &other );
-        ~ContextInstType();
+        TraitInstType( const Type::Qualifiers &tq, const std::string &name ) : Parent( tq, name ) {}
+        TraitInstType( const TraitInstType &other );
+        ~TraitInstType();
 
         std::list< Declaration* >& get_members() { return members; }
 
-        virtual ContextInstType *clone() const { return new ContextInstType( *this ); }
+        virtual TraitInstType *clone() const { return new TraitInstType( *this ); }
         virtual void accept( Visitor &v ) { v.visit( this ); }
         virtual Type *acceptMutator( Mutator &m ) { return m.mutate( this ); }
@@ -402 +402 @@
 /// Represents the GCC built-in varargs type
 class VarArgsType : public Type {
+  public:
         VarArgsType();
+        VarArgsType( Type::Qualifiers tq );
 
         virtual VarArgsType *clone() const { return new VarArgsType( *this ); }