Changeset 38093ae for src/SymTab

Timestamp:

Apr 18, 2024, 8:44:24 PM (6 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/SymTab

Files:

• GenImplicitCall.cpp (modified) (1 diff)
• Mangler.cc (modified) (1 diff)
• ManglerCommon.cc (modified) (2 diffs)

src/SymTab/GenImplicitCall.cpp

@@ -133 +133 @@
 
         ast::ptr< ast::DeclWithType > index = new ast::ObjectDecl(
-                loc, indexName.newName(), new ast::BasicType( ast::BasicType::SignedInt ),
+                loc, indexName.newName(), new ast::BasicType( ast::BasicKind::SignedInt ),
                 new ast::SingleInit( loc, begin ) );
         ast::ptr< ast::Expr > indexVar = new ast::VariableExpr( loc, index );

src/SymTab/Mangler.cc

@@ -142 +142 @@
 void Mangler::postvisit( const ast::BasicType * basicType ) {
         printQualifiers( basicType );
-        assertf( basicType->kind < ast::BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
+        assertf( basicType->kind < ast::BasicKind::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
         mangleName += Encoding::basicTypes[ basicType->kind ];
 }

src/SymTab/ManglerCommon.cc

@@ -41 +41 @@
 //   - "Di" char32_t
 //   - "Ds" char16_t
-const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {
+const std::string basicTypes[ast::BasicKind::NUMBER_OF_BASIC_TYPES] = {
         "b",        // _Bool
         "c",        // char
@@ -81 +81 @@
 // GENERATED END
 static_assert(
-        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
+        sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicKind::NUMBER_OF_BASIC_TYPES,
         "Each basic type kind should have a corresponding mangler letter"
 );