Changeset 78a0b88 for src/SynTree

Timestamp:

Sep 1, 2017, 3:33:25 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

bc3127d

Parents:

e8ccca3 (diff), a01f7c94 (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 'master' of plg2:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Mutator.cc (modified) (1 diff)
• ReferenceToType.cc (modified) (1 diff)
• Type.h (modified) (1 diff)
• TypeSubstitution.h (modified) (1 diff)
• Visitor.cc (modified) (1 diff)

src/SynTree/Mutator.cc

@@ -538 +538 @@
 Type * Mutator::mutate( TraitInstType *aggregateUseType ) {
         handleReferenceToType( aggregateUseType );
-        mutateAll( aggregateUseType->get_members(), *this );
         return aggregateUseType;
 }

src/SynTree/ReferenceToType.cc

@@ -132 +132 @@
 std::string TraitInstType::typeString() const { return "trait"; }
 
-TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ) {
-        cloneAll( other.members, members );
+TraitInstType::TraitInstType( const Type::Qualifiers & tq, TraitDecl * baseTrait, const std::list< Attribute * > & attributes ) : Parent( tq, baseTrait->name, attributes ), baseTrait( baseTrait ) {}
+
+TraitInstType::TraitInstType( const TraitInstType &other ) : Parent( other ), baseTrait( other.baseTrait ) {
 }
 
 TraitInstType::~TraitInstType() {
-        deleteAll( members );
 }
 

src/SynTree/Type.h

@@ -471 +471 @@
         typedef ReferenceToType Parent;
   public:
-        // this member is filled in by the validate pass, which instantiates the members of the correponding
-        // aggregate with the actual type parameters specified for this use of the context
-        std::list< Declaration* > members;
-
-        TraitInstType( const Type::Qualifiers & tq, const std::string & name, const std::list< Attribute * > & attributes = std::list< Attribute * >()  ) : Parent( tq, name, attributes ) {}
+        // this decl is not "owned" by the trait inst; it is merely a pointer to elsewhere in the tree,
+        // where the trait used in this type is actually defined
+        TraitDecl * baseTrait = nullptr;
+
+        TraitInstType( const Type::Qualifiers & tq, const std::string & name, const std::list< Attribute * > & attributes = std::list< Attribute * >() ) : Parent( tq, name, attributes ) {}
+        TraitInstType( const Type::Qualifiers & tq, TraitDecl * baseTrait, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
         TraitInstType( const TraitInstType & other );
         ~TraitInstType();
-
-        std::list< Declaration* >& get_members() { return members; }
 
         virtual bool isComplete() const;

src/SynTree/TypeSubstitution.h

@@ -177 +177 @@
 void applySubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actual, MemberIterator memberBegin, MemberIterator memberEnd, OutputIterator out ) {
         TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
-        for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
+        for ( auto i = memberBegin; i != memberEnd; ++i ) {
                 sub.apply( *i );
                 *out++ = *i;

src/SynTree/Visitor.cc

@@ -429 +429 @@
 void Visitor::visit( TraitInstType *aggregateUseType ) {
         handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
-        acceptAll( aggregateUseType->get_members(), *this );
 }