Changeset 235b41f for src/SynTree/Type.h

Timestamp:

Sep 5, 2017, 3:41:04 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

416cc86

Parents:

800d275 (diff), 3f8dd01 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SynTree/Type.h (modified) (1 diff)

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;