Changeset 63bde81 for src/Common

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/Common

Files:

• CodeLocationTools.cpp (modified) (1 diff)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (1 diff)

src/Common/CodeLocationTools.cpp

@@ -176 +176 @@
     macro(TupleType, Type) \
     macro(TypeofType, Type) \
+    macro(VTableType, Type) \
     macro(VarArgsType, Type) \
     macro(ZeroType, Type) \

src/Common/PassVisitor.h

@@ -230 +230 @@
         virtual void visit( TypeofType * typeofType ) override final;
         virtual void visit( const TypeofType * typeofType ) override final;
+        virtual void visit( VTableType * vtableType ) override final;
+        virtual void visit( const VTableType * vtableType ) override final;
         virtual void visit( AttrType * attrType ) override final;
         virtual void visit( const AttrType * attrType ) override final;
@@ -343 +345 @@
         virtual Type * mutate( TupleType * tupleType ) override final;
         virtual Type * mutate( TypeofType * typeofType ) override final;
+        virtual Type * mutate( VTableType * vtableType ) override final;
         virtual Type * mutate( AttrType * attrType ) override final;
         virtual Type * mutate( VarArgsType * varArgsType ) override final;

src/Common/PassVisitor.impl.h

@@ -3610 +3610 @@
 
 //--------------------------------------------------------------------------
+// VTableType
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( VTableType * node ) {
+        VISIT_START( node );
+
+        // Forall qualifiers should be on base type, not here
+        // maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->base, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( const VTableType * node ) {
+        VISIT_START( node );
+
+        // Forall qualifiers should be on base type, not here
+        // maybeAccept_impl( node->forall, *this );
+        maybeAccept_impl( node->base, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( VTableType * node ) {
+        MUTATE_START( node );
+
+        // Forall qualifiers should be on base type, not here
+        // maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->base, *this );
+
+        MUTATE_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
 // AttrType
 template< typename pass_type >