Changeset 63bde81 for src/SynTree

Timestamp:

Jul 19, 2021, 4:03:19 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

f9b68d6

Parents:

12a1013 (diff), fcaa1e4 (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

Location:

src/SynTree

Files:

• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Type.cc (modified) (2 diffs)
• Type.h (modified) (2 diffs)
• Visitor.h (modified) (1 diff)

src/SynTree/Mutator.h

@@ -112 +112 @@
         virtual Type * mutate( TupleType * tupleType ) = 0;
         virtual Type * mutate( TypeofType * typeofType ) = 0;
+        virtual Type * mutate( VTableType * vtableType ) = 0;
         virtual Type * mutate( AttrType * attrType ) = 0;
         virtual Type * mutate( VarArgsType * varArgsType ) = 0;

src/SynTree/SynTree.h

@@ -119 +119 @@
 class TupleType;
 class TypeofType;
+class VTableType;
 class AttrType;
 class VarArgsType;

src/SynTree/Type.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 15 16:52:37 2019
-// Update Count     : 49
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 14 15:47:00 2021
+// Update Count     : 50
 //
 #include "Type.h"
@@ -178 +178 @@
 }
 
+VTableType::VTableType( const Type::Qualifiers &tq, Type *base, const std::list< Attribute * > & attributes )
+                : Type( tq, attributes ), base( base ) {
+        assertf( base, "VTableType with a null base created." );
+}
+
+VTableType::VTableType( const VTableType &other )
+                : Type( other ), base( other.base->clone() ) {
+}
+
+VTableType::~VTableType() {
+        delete base;
+}
+
+void VTableType::print( std::ostream &os, Indenter indent ) const {
+        Type::print( os, indent );
+        os << "get virtual-table type of ";
+        if ( base ) {
+                base->print( os, indent );
+        } // if
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Sep  4 09:58:00 2019
-// Update Count     : 170
+// Last Modified On : Wed Jul 14 15:40:00 2021
+// Update Count     : 171
 //
 
@@ -651 +651 @@
 };
 
+class VTableType : public Type {
+public:
+        Type *base;
+
+        VTableType( const Type::Qualifiers & tq, Type *base,
+                const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        VTableType( const VTableType & );
+        virtual ~VTableType();
+
+        Type *get_base() { return base; }
+        void set_base( Type *newValue ) { base = newValue; }
+
+        virtual VTableType *clone() const override { return new VTableType( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 class AttrType : public Type {
   public:

src/SynTree/Visitor.h

@@ -198 +198 @@
         virtual void visit( TypeofType * node ) { visit( const_cast<const TypeofType *>(node) ); }
         virtual void visit( const TypeofType * typeofType ) = 0;
+        virtual void visit( VTableType * node ) { visit( const_cast<const VTableType *>(node) ); }
+        virtual void visit( const VTableType * vtableType ) = 0;
         virtual void visit( AttrType * node ) { visit( const_cast<const AttrType *>(node) ); }
         virtual void visit( const AttrType * attrType ) = 0;