[examples] generate enum types with typedefs when they have underlying basic types

This commit is contained in:
Allen Webster
2021-09-25 20:35:36 -07:00
parent 1ff9a17ef5
commit e80557cbfd
3 changed files with 34 additions and 9 deletions
@@ -1,4 +1,4 @@
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:500 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:524
TypeInfoMember Circle_members[2] = { TypeInfoMember Circle_members[2] = {
{"r", 1, -1, &F32_type_info}, {"r", 1, -1, &F32_type_info},
{"pos", 3, -1, &V2F32_type_info}, {"pos", 3, -1, &V2F32_type_info},
@@ -14,14 +14,14 @@ TypeInfoMember RoundedPolygon_members[3] = {
{"p", 1, 1, &V2F32_type_info}, {"p", 1, 1, &V2F32_type_info},
}; };
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:539 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:563
TypeInfoEnumerant Shape_members[3] = { TypeInfoEnumerant Shape_members[3] = {
{"Circle", 6, 1}, {"Circle", 6, 1},
{"Segment", 7, 2}, {"Segment", 7, 2},
{"Polygon", 7, 3}, {"Polygon", 7, 3},
}; };
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:575 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:599
TypeInfo U32_type_info = {TypeKind_Basic, "U32", 3, 4, 0, 0}; TypeInfo U32_type_info = {TypeKind_Basic, "U32", 3, 4, 0, 0};
TypeInfo F32_type_info = {TypeKind_Basic, "F32", 3, 4, 0, 0}; TypeInfo F32_type_info = {TypeKind_Basic, "F32", 3, 4, 0, 0};
TypeInfo V2F32_type_info = {TypeKind_Basic, "V2F32", 5, 8, 0, 0}; TypeInfo V2F32_type_info = {TypeKind_Basic, "V2F32", 5, 8, 0, 0};
@@ -21,18 +21,19 @@ F32 r;
U32 count; U32 count;
V2F32 *p; V2F32 *p;
}; };
typedef enum Shape typedef U32 Shape;
enum
{ {
Shape_Circle = 1, Shape_Circle = 1,
Shape_Segment = 2, Shape_Segment = 2,
Shape_Polygon = 3, Shape_Polygon = 3,
} Shape; };
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:459 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:483
TypeInfo* type_info_from_shape(Shape v); TypeInfo* type_info_from_shape(Shape v);
U32 max_slot_from_shape(Shape v); U32 max_slot_from_shape(Shape v);
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:484 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:508
extern TypeInfo U32_type_info; extern TypeInfo U32_type_info;
extern TypeInfo F32_type_info; extern TypeInfo F32_type_info;
extern TypeInfo V2F32_type_info; extern TypeInfo V2F32_type_info;
+26 -2
View File
@@ -435,7 +435,21 @@ gen_type_definitions_from_types(FILE *out)
case GEN_TypeKind_Enum: case GEN_TypeKind_Enum:
{ {
MD_String8 enum_name = type->node->string; MD_String8 enum_name = type->node->string;
fprintf(out, "typedef enum %.*s\n", MD_S8VArg(enum_name)); GEN_TypeInfo *underlying_type = type->underlying_type;
// enum header
if (underlying_type != 0)
{
MD_String8 underlying_type_name = underlying_type->node->string;
fprintf(out, "typedef %.*s %.*s;\n",
MD_S8VArg(underlying_type_name), MD_S8VArg(enum_name));
fprintf(out, "enum\n");
}
else
{
fprintf(out, "typedef enum %.*s\n", MD_S8VArg(enum_name));
}
fprintf(out, "{\n"); fprintf(out, "{\n");
for (GEN_TypeEnumerant *enumerant = type->first_enumerant; for (GEN_TypeEnumerant *enumerant = type->first_enumerant;
enumerant != 0; enumerant != 0;
@@ -445,7 +459,17 @@ gen_type_definitions_from_types(FILE *out)
fprintf(out, "%.*s_%.*s = %d,\n", fprintf(out, "%.*s_%.*s = %d,\n",
MD_S8VArg(enum_name), MD_S8VArg(member_name), enumerant->value); MD_S8VArg(enum_name), MD_S8VArg(member_name), enumerant->value);
} }
fprintf(out, "} %.*s;\n", MD_S8VArg(enum_name));
// enum footer
if (underlying_type != 0)
{
fprintf(out, "};\n");
}
else
{
fprintf(out, "} %.*s;\n", MD_S8VArg(enum_name));
}
}break; }break;
} }
} }