Changeset 38093ae for src/Validate/ImplementEnumFunc.cpp

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

File:

• src/Validate/ImplementEnumFunc.cpp (modified) (2 diffs)

src/Validate/ImplementEnumFunc.cpp

@@ -305 +305 @@
         {new ast::ObjectDecl(
             getLocation(), "_ret",
-            new ast::PointerType(new ast::BasicType{ast::BasicType::Char}))});
+            new ast::PointerType(new ast::BasicType{ast::BasicKind::Char}))});
 }
 
@@ -358 +358 @@
         attr == ast::EnumAttribute::Value
             ? decl->base
-            : new ast::PointerType(new ast::BasicType{ast::BasicType::Char}),
+            : new ast::PointerType(new ast::BasicType{ast::BasicKind::Char}),
         ast::ConstantExpr::from_int(decl->location, decl->members.size()),
         ast::LengthFlag::FixedLen, ast::DimensionFlag::DynamicDim);