Changeset 38093ae for src/CodeGen

Timestamp:

Apr 18, 2024, 8:44:24 PM (18 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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:

Resolve conflict

Location:

src/CodeGen

Files:

• FixMain.cc (modified) (2 diffs)
• GenType.cc (modified) (1 diff)

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

@@ -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 );