Changes in src/SynTree/Type.h [5ccb10d:be9036d]

File:

• src/SynTree/Type.h (modified) (2 diffs)

src/SynTree/Type.h

@@ -16 +16 @@
 #pragma once
 
-#include "BaseSyntaxNode.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Visitor.h"
-#include <strings.h>                                                                    // ffs
+#include <strings.h>         // for ffs
+#include <cassert>           // for assert, assertf
+#include <list>              // for list, _List_iterator
+#include <ostream>           // for ostream, operator<<, basic_ostream
+#include <string>            // for string
+
+#include "BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "Common/utility.h"  // for operator+
+#include "Mutator.h"         // for Mutator
+#include "SynTree.h"         // for AST nodes
+#include "Visitor.h"         // for Visitor
 
 class Type : public BaseSyntaxNode {
@@ -465 +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;