Index: src/SynTree/AggregateDecl.cc =================================================================== --- src/SynTree/AggregateDecl.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/AggregateDecl.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Sun May 17 23:56:39 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jun 13 08:12:49 2015 -// Update Count : 6 +// Last Modified On : Wed Mar 2 17:28:00 2016 +// Update Count : 7 // @@ -64,5 +64,5 @@ std::string EnumDecl::typeString() const { return "enum"; } -std::string ContextDecl::typeString() const { return "context"; } +std::string TraitDecl::typeString() const { return "context"; } // Local Variables: // Index: src/SynTree/Declaration.h =================================================================== --- src/SynTree/Declaration.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Declaration.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Dec 09 14:08:22 2015 -// Update Count : 32 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Mar 2 17:28:11 2016 +// Update Count : 33 // @@ -246,11 +246,11 @@ }; -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 ); } Index: src/SynTree/Mutator.cc =================================================================== --- src/SynTree/Mutator.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Mutator.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sat Jul 25 19:21:33 2015 -// Update Count : 11 +// Last Modified On : Wed Mar 2 17:28:20 2016 +// Update Count : 12 // @@ -63,5 +63,5 @@ } -Declaration *Mutator::mutate( ContextDecl *aggregateDecl ) { +Declaration *Mutator::mutate( TraitDecl *aggregateDecl ) { handleAggregateDecl( aggregateDecl ); return aggregateDecl; @@ -387,5 +387,5 @@ } -Type *Mutator::mutate( ContextInstType *aggregateUseType ) { +Type *Mutator::mutate( TraitInstType *aggregateUseType ) { handleReferenceToType( aggregateUseType ); mutateAll( aggregateUseType->get_members(), *this ); Index: src/SynTree/Mutator.h =================================================================== --- src/SynTree/Mutator.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Mutator.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Nov 19 22:26:16 2015 -// Update Count : 8 +// Last Modified On : Wed Mar 2 17:33:11 2016 +// Update Count : 9 // #include @@ -31,5 +31,5 @@ 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 ); @@ -85,5 +85,5 @@ virtual Type* mutate( UnionInstType *aggregateUseType ); virtual Type* mutate( EnumInstType *aggregateUseType ); - virtual Type* mutate( ContextInstType *aggregateUseType ); + virtual Type* mutate( TraitInstType *aggregateUseType ); virtual Type* mutate( TypeInstType *aggregateUseType ); virtual Type* mutate( TupleType *tupleType ); Index: src/SynTree/ReferenceToType.cc =================================================================== --- src/SynTree/ReferenceToType.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/ReferenceToType.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Jun 7 08:31:48 2015 -// Update Count : 4 +// Last Modified On : Wed Mar 2 17:28:51 2016 +// Update Count : 5 // @@ -83,11 +83,11 @@ std::string EnumInstType::typeString() const { return "enum"; } -std::string ContextInstType::typeString() const { return "context"; } +std::string TraitInstType::typeString() const { return "context"; } -ContextInstType::ContextInstType( const ContextInstType &other ) : Parent( other ) { +TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ) { cloneAll( other.members, members ); } -ContextInstType::~ContextInstType() { +TraitInstType::~TraitInstType() { deleteAll( members ); } Index: src/SynTree/SynTree.h =================================================================== --- src/SynTree/SynTree.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/SynTree.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jul 23 23:25:04 2015 -// Update Count : 3 +// Last Modified On : Wed Mar 2 17:29:00 2016 +// Update Count : 4 // @@ -30,5 +30,5 @@ class UnionDecl; class EnumDecl; -class ContextDecl; +class TraitDecl; class NamedTypeDecl; class TypeDecl; @@ -92,5 +92,5 @@ class UnionInstType; class EnumInstType; -class ContextInstType; +class TraitInstType; class TypeInstType; class TupleType; Index: src/SynTree/Type.h =================================================================== --- src/SynTree/Type.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Type.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -9,7 +9,7 @@ // 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,14 +296,14 @@ }; -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,6 +402,7 @@ /// Represents the GCC built-in varargs type class VarArgsType : public Type { + public: VarArgsType(); - VarArgsType( Type::Qualifiers &tq ); + VarArgsType( Type::Qualifiers tq ); virtual VarArgsType *clone() const { return new VarArgsType( *this ); } Index: src/SynTree/TypeSubstitution.cc =================================================================== --- src/SynTree/TypeSubstitution.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/TypeSubstitution.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 18 11:10:04 2015 -// Update Count : 2 +// Last Modified On : Wed Mar 2 17:29:15 2016 +// Update Count : 3 // @@ -190,5 +190,5 @@ } -Type * TypeSubstitution::mutate( ContextInstType *aggregateUseType ) { +Type * TypeSubstitution::mutate( TraitInstType *aggregateUseType ) { return handleType( aggregateUseType ); } Index: src/SynTree/TypeSubstitution.h =================================================================== --- src/SynTree/TypeSubstitution.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/TypeSubstitution.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon May 18 11:12:30 2015 -// Update Count : 1 +// Last Modified On : Wed Mar 2 17:33:19 2016 +// Update Count : 2 // @@ -72,5 +72,5 @@ virtual Type* mutate(UnionInstType *aggregateUseType); virtual Type* mutate(EnumInstType *aggregateUseType); - virtual Type* mutate(ContextInstType *aggregateUseType); + virtual Type* mutate(TraitInstType *aggregateUseType); virtual Type* mutate(TupleType *tupleType); virtual Type* mutate(VarArgsType *varArgsType); Index: src/SynTree/VarArgsType.cc =================================================================== --- src/SynTree/VarArgsType.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/VarArgsType.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -9,7 +9,7 @@ // Author : Aaron B. Moss // Created On : Thu Feb 25 16:34:00 2016 -// Last Modified By : Aaron B. Moss -// Last Modified On : Thu Feb 25 16:34:00 2016 -// Update Count : 1 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Mar 2 17:10:40 2016 +// Update Count : 2 // @@ -18,5 +18,5 @@ VarArgsType::VarArgsType() : Type( Type::Qualifiers() ) {} -VarArgsType::VarArgsType( Type::Qualifiers &tq ) : Type( tq ) {} +VarArgsType::VarArgsType( Type::Qualifiers tq ) : Type( tq ) {} void VarArgsType::print( std::ostream &os, int indent ) const { Index: src/SynTree/Visitor.cc =================================================================== --- src/SynTree/Visitor.cc (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Visitor.cc (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri Jul 24 16:11:05 2015 -// Update Count : 15 +// Last Modified On : Wed Mar 2 17:29:23 2016 +// Update Count : 16 // @@ -56,5 +56,5 @@ } -void Visitor::visit( ContextDecl *aggregateDecl ) { +void Visitor::visit( TraitDecl *aggregateDecl ) { visit( static_cast< AggregateDecl* >( aggregateDecl ) ); } @@ -326,5 +326,5 @@ } -void Visitor::visit( ContextInstType *aggregateUseType ) { +void Visitor::visit( TraitInstType *aggregateUseType ) { visit( static_cast< ReferenceToType * >( aggregateUseType ) ); acceptAll( aggregateUseType->get_members(), *this ); Index: src/SynTree/Visitor.h =================================================================== --- src/SynTree/Visitor.h (revision 9d7b3ea1ccb5d1eccef1e7382c27f22177146c1a) +++ src/SynTree/Visitor.h (revision 984dce6bb5af39c6108d6d825e085c449dc9f3ad) @@ -10,6 +10,6 @@ // Created On : Mon May 18 07:44:20 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jan 25 21:20:44 2016 -// Update Count : 5 +// Last Modified On : Wed Mar 2 17:33:35 2016 +// Update Count : 6 // @@ -31,5 +31,5 @@ virtual void visit( UnionDecl *aggregateDecl ); virtual void visit( EnumDecl *aggregateDecl ); - virtual void visit( ContextDecl *aggregateDecl ); + virtual void visit( TraitDecl *aggregateDecl ); virtual void visit( TypeDecl *typeDecl ); virtual void visit( TypedefDecl *typeDecl ); @@ -85,5 +85,5 @@ virtual void visit( UnionInstType *aggregateUseType ); virtual void visit( EnumInstType *aggregateUseType ); - virtual void visit( ContextInstType *aggregateUseType ); + virtual void visit( TraitInstType *aggregateUseType ); virtual void visit( TypeInstType *aggregateUseType ); virtual void visit( TupleType *tupleType );