Changeset 63bde81 for src/AST

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

Files:

• Convert.cpp (modified) (3 diffs)
• Fwd.hpp (modified) (1 diff)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Type.hpp (modified) (2 diffs)
• Visitor.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:43:51 2021
-// Update Count     : 36
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 14 16:15:00 2021
+// Update Count     : 37
 //
 
@@ -1356 +1356 @@
         }
 
+        const ast::Type * visit( const ast::VTableType * node ) override final {
+                return visitType( node, new VTableType{
+                        cv( node ),
+                        get<Type>().accept1( node->base )
+                } );
+        }
+
         const ast::Type * visit( const ast::VarArgsType * node ) override final {
                 return visitType( node, new VarArgsType{ cv( node ) } );
@@ -2799 +2806 @@
         }
 
+        virtual void visit( const VTableType * old ) override final {
+                visitType( old, new ast::VTableType{
+                        GET_ACCEPT_1( base, Type ),
+                        cv( old )
+                } );
+        }
+
         virtual void visit( const AttrType * ) override final {
                 assertf( false, "AttrType deprecated in new AST." );

src/AST/Fwd.hpp

@@ -117 +117 @@
 class TupleType;
 class TypeofType;
+class VTableType;
 class VarArgsType;
 class ZeroType;

src/AST/Pass.hpp

@@ -213 +213 @@
         const ast::Type *             visit( const ast::TupleType            * ) override final;
         const ast::Type *             visit( const ast::TypeofType           * ) override final;
+        const ast::Type *             visit( const ast::VTableType           * ) override final;
         const ast::Type *             visit( const ast::VarArgsType          * ) override final;
         const ast::Type *             visit( const ast::ZeroType             * ) override final;

src/AST/Pass.impl.hpp

@@ -1873 +1873 @@
 
 //--------------------------------------------------------------------------
+// VTableType
+template< typename core_t >
+const ast::Type * ast::Pass< core_t >::visit( const ast::VTableType * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &VTableType::base );
+        )
+
+        VISIT_END( Type, node );
+}
+
+//--------------------------------------------------------------------------
 // VarArgsType
 template< typename core_t >

src/AST/Print.cpp

@@ -1416 +1416 @@
         }
 
+        virtual const ast::Type * visit( const ast::VTableType * node ) override final {
+                preprint( node );
+                os << "vtable for ";
+                safe_print( node->base );
+
+                return node;
+        }
+
         virtual const ast::Type * visit( const ast::VarArgsType * node ) override final {
                 preprint( node );

src/AST/Type.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jul 23 14:15:00 2020
-// Update Count     : 6
+// Last Modified On : Wed Jul 14 15:54:00 2021
+// Update Count     : 7
 //
 
@@ -491 +491 @@
 };
 
+/// Virtual Table Type `vtable(T)`
+class VTableType final : public Type {
+public:
+        ptr<Type> base;
+
+        VTableType( const Type * b, CV::Qualifiers q = {} ) : Type(q), base(b) {}
+
+        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        VTableType * clone() const override { return new VTableType{ *this }; }
+        MUTATE_FRIEND
+};
+
 /// GCC built-in varargs type
 class VarArgsType final : public Type {

src/AST/Visitor.hpp

@@ -105 +105 @@
     virtual const ast::Type *             visit( const ast::TupleType            * ) = 0;
     virtual const ast::Type *             visit( const ast::TypeofType           * ) = 0;
+    virtual const ast::Type *             visit( const ast::VTableType           * ) = 0;
     virtual const ast::Type *             visit( const ast::VarArgsType          * ) = 0;
     virtual const ast::Type *             visit( const ast::ZeroType             * ) = 0;