Changeset 4e08a54 for src/CodeGen

Timestamp:

Apr 19, 2024, 12:01:34 PM (23 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

b9b6efb

Parents:

da87eaf (diff), 02c80cdc (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:

• FixMain.cc (modified) (2 diffs)
• GenType.cc (modified) (3 diffs)

src/CodeGen/FixMain.cc

@@ -52 +52 @@
 ast::ObjectDecl * makeIntObj(){
         return new ast::ObjectDecl( CodeLocation(), "",
-                new ast::BasicType( ast::BasicType::SignedInt ) );
+                new ast::BasicType( ast::BasicKind::SignedInt ) );
 }
 
@@ -59 +59 @@
                 new ast::PointerType(
                         new ast::PointerType(
-                                new ast::BasicType( ast::BasicType::Char ) ) ) );
+                                new ast::BasicType( ast::BasicKind::Char ) ) ) );
 }
 

src/CodeGen/GenType.cc

@@ -46 +46 @@
         void postvisit( ast::UnionInstType const * type );
         void postvisit( ast::EnumInstType const * type );
-        void postvisit( ast::EnumPosType const * type );
+        void postvisit( ast::EnumAttrType const * type );
         void postvisit( ast::TypeInstType const * type );
         void postvisit( ast::TupleType const * type );
@@ -87 +87 @@
 
 void GenType::postvisit( ast::BasicType const * type ) {
-        ast::BasicType::Kind kind = type->kind;
-        assert( 0 <= kind && kind < ast::BasicType::NUMBER_OF_BASIC_TYPES );
+        ast::BasicKind kind = type->kind;
+        assert( 0 <= kind && kind < ast::BasicKind::NUMBER_OF_BASIC_TYPES );
         result = std::string( ast::BasicType::typeNames[kind] ) + " " + result;
         handleQualifiers( type );
@@ -240 +240 @@
 }
 
-void GenType::postvisit( ast::EnumPosType const * type ) {
+void GenType::postvisit( ast::EnumAttrType const * type ) {
         postvisit( type->instance );
 }