Changeset c194661 for src/SynTree

Timestamp:

Jun 20, 2018, 11:23:42 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0b3b2ae

Parents:

9a7a3b6

Message:

Reorganize QualifiedType node

Location:

src/SynTree

Files:

• Type.cc (modified) (1 diff)
• Type.h (modified) (1 diff)

src/SynTree/Type.cc

@@ -106 +106 @@
 
 
-QualifiedType::QualifiedType( const Type::Qualifiers & tq, const std::list< Type * > & types ) : Type( tq, {} ), types( types ) {
+QualifiedType::QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child ) : Type( tq, {} ), parent( parent ), child( child ) {
 }
 
-QualifiedType::QualifiedType( const QualifiedType & other ) : Type( other ) {
-        cloneAll( other.types, types );
+QualifiedType::QualifiedType( const QualifiedType & other ) : Type( other ), parent( maybeClone( other.parent ) ), child( maybeClone( other.child ) ) {
 }
 
 QualifiedType::~QualifiedType() {
-        deleteAll( types );
+        delete parent;
+        delete child;
 }
 
 void QualifiedType::print( std::ostream & os, Indenter indent ) const {
         os << "Qualified Type: " << endl;
-        printAll( types, os, indent+1 );
+        os << indent+1;
+        parent->print( os, indent+1 );
+        os << endl << indent+1;
+        child->print( os, indent+1 );
+        os << endl;
         Type::print( os, indent+1 );
 }

src/SynTree/Type.h

@@ -317 +317 @@
 class QualifiedType : public Type {
 public:
-        std::list<Type *> types;
-
-        QualifiedType( const Type::Qualifiers & tq, const std::list< Type * > & types );
+        Type * parent;
+        Type * child;
+
+        QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child );
         QualifiedType( const QualifiedType & tq );
         virtual ~QualifiedType();