Changeset e5d9274 for src/CodeGen/GenType.cc

Timestamp:

Jun 2, 2022, 3:11:21 PM (23 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (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

File:

• src/CodeGen/GenType.cc (modified) (4 diffs)

src/CodeGen/GenType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May  1 15:24:00 2019
-// Update Count     : 23
+// Last Modified On : Fri May 20 11:18:00 2022
+// Update Count     : 24
 //
 #include "GenType.h"
@@ -50 +50 @@
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
+                void postvisit( VTableType * vtable );
                 void postvisit( QualifiedType * qualType );
 
@@ -259 +260 @@
                         if ( options.genC ) {
                                 typeString = "enum " + typeString;
-                        } 
-                } 
+                        }
+                }
                 handleQualifiers( enumInst );
         }
 
         void GenType::postvisit( TypeInstType * typeInst ) {
+                assertf( ! options.genC, "Type instance types should not reach code generation." );
                 typeString = typeInst->name + " " + typeString;
                 handleQualifiers( typeInst );
@@ -320 +322 @@
         }
 
+        void GenType::postvisit( VTableType * vtable ) {
+                assertf( ! options.genC, "Virtual table types should not reach code generation." );
+                std::ostringstream os;
+                os << "vtable(" << genType( vtable->base, "", options ) << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( vtable );
+        }
+
         void GenType::postvisit( QualifiedType * qualType ) {
                 assertf( ! options.genC, "Qualified types should not reach code generation." );