From e80557cbfddf451ca8082494bfca26f810422d9c Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Sat, 25 Sep 2021 20:35:36 -0700 Subject: [PATCH] [examples] generate enum types with typedefs when they have underlying basic types --- examples/type_metadata/generated/meta_types.c | 6 ++-- examples/type_metadata/generated/meta_types.h | 9 +++--- examples/type_metadata/type_metadata.c | 28 +++++++++++++++++-- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/examples/type_metadata/generated/meta_types.c b/examples/type_metadata/generated/meta_types.c index 85eac4b..446da07 100644 --- a/examples/type_metadata/generated/meta_types.c +++ b/examples/type_metadata/generated/meta_types.c @@ -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] = { {"r", 1, -1, &F32_type_info}, {"pos", 3, -1, &V2F32_type_info}, @@ -14,14 +14,14 @@ TypeInfoMember RoundedPolygon_members[3] = { {"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] = { {"Circle", 6, 1}, {"Segment", 7, 2}, {"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 F32_type_info = {TypeKind_Basic, "F32", 3, 4, 0, 0}; TypeInfo V2F32_type_info = {TypeKind_Basic, "V2F32", 5, 8, 0, 0}; diff --git a/examples/type_metadata/generated/meta_types.h b/examples/type_metadata/generated/meta_types.h index f202826..a39c139 100644 --- a/examples/type_metadata/generated/meta_types.h +++ b/examples/type_metadata/generated/meta_types.h @@ -21,18 +21,19 @@ F32 r; U32 count; V2F32 *p; }; -typedef enum Shape +typedef U32 Shape; +enum { Shape_Circle = 1, Shape_Segment = 2, 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); 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 F32_type_info; extern TypeInfo V2F32_type_info; diff --git a/examples/type_metadata/type_metadata.c b/examples/type_metadata/type_metadata.c index 3db3f83..a2b45f4 100644 --- a/examples/type_metadata/type_metadata.c +++ b/examples/type_metadata/type_metadata.c @@ -435,7 +435,21 @@ gen_type_definitions_from_types(FILE *out) case GEN_TypeKind_Enum: { 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"); for (GEN_TypeEnumerant *enumerant = type->first_enumerant; enumerant != 0; @@ -445,7 +459,17 @@ gen_type_definitions_from_types(FILE *out) fprintf(out, "%.*s_%.*s = %d,\n", 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; } }