Changeset 8c79dc3c for src/Parser

Timestamp:

Sep 14, 2024, 5:08:21 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

17fdf6f

Parents:

dcfcf368 (diff), 5ef4008 (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.cpp (modified) (1 diff)

src/Parser/TypeData.cpp

@@ -1457 +1457 @@
         assert( td->kind == TypeData::Aggregate );
         assert( td->aggregate.kind == ast::AggregateDecl::Enum );
-        ast::ptr<ast::Type> baseType = td->base ? typebuild(td->base) : nullptr;
-
+        ast::ptr<ast::Type> baseType;
+        if ( td->base ) {
+                if ( td->base->kind == TypeData::Aggregate ) {
+                        baseType = buildComAggInst( td->base, copy(attributes), linkage );
+                } else {
+                        baseType = typebuild( td->base );
+                }
+        }
         ast::EnumDecl * ret = new ast::EnumDecl(
                 td->location,