Changeset d83b266 for src/Parser/TypeData.cc

Timestamp:

Jul 26, 2021, 2:42:34 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0a061c0

Parents:

c86ee4c (diff), 98233b3 (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/Parser/TypeData.cc (modified) (8 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 07:56:46 2019
-// Update Count     : 662
+// Last Modified By : Henry Xue
+// Last Modified On : Tue Jul 20 04:10:50 2021
+// Update Count     : 673
 //
 
@@ -100 +100 @@
                 typeexpr = nullptr;
                 break;
+          case Vtable:
+                break;
           case Builtin:
                 // builtin = new Builtin_t;
@@ -170 +172 @@
                 // delete typeexpr->expr;
                 delete typeexpr;
+                break;
+          case Vtable:
                 break;
           case Builtin:
@@ -249 +253 @@
           case Basetypeof:
                 newtype->typeexpr = maybeClone( typeexpr );
+                break;
+          case Vtable:
                 break;
           case Builtin:
@@ -467 +473 @@
           case Basetypeof:
           case Builtin:
+          case Vtable:
                 assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
                 break;
@@ -546 +553 @@
           case TypeData::Basetypeof:
                 return buildTypeof( td );
+          case TypeData::Vtable:
+                return buildVtable( td );
           case TypeData::Builtin:
                 switch ( td->builtintype ) {
@@ -769 +778 @@
           case AggregateDecl::Struct:
           case AggregateDecl::Coroutine:
+          case AggregateDecl::Exception:
           case AggregateDecl::Generator:
           case AggregateDecl::Monitor:
@@ -945 +955 @@
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
-        return new TypeofType{
-                buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
+        return new TypeofType{ buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
 } // buildTypeof
+
+
+VTableType * buildVtable( const TypeData * td ) {
+        assert( td->base );
+        return new VTableType{ buildQualifiers( td ), typebuild( td->base ) };
+} // buildVtable