Changeset 862658a for src/CodeGen

Timestamp:

Jan 11, 2023, 1:43:30 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

42b739d7

Parents:

b49310f (diff), 8fcf921 (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/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -283 +283 @@
                                 assert( obj );
                                 output << "static ";
-                                output << genType(enumDecl->base, "", options) << " const ";
-                                output << mangleName( obj ) << " ";
+                                output << genType(enumDecl->base, mangleName( obj ), options);
                                 output << " = ";
                                 output << "(" << genType(enumDecl->base, "", options) << ")";

src/CodeGen/GenType.cc

@@ -255 +255 @@
         void GenType::postvisit( EnumInstType * enumInst ) {
                 if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
-                        typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
+                        typeString = genType(enumInst->baseEnum->base, typeString, options);
                 } else {
                         typeString = enumInst->name + " " + typeString;