From e36e0de276a2d75af87bcc15b6278149a92fd7d8 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 1 Oct 2021 19:21:51 -0700 Subject: [PATCH] [example] use type as receipt of work instead of a boolean --- examples/type_metadata/generated/meta_types.c | 8 +- examples/type_metadata/generated/meta_types.h | 6 +- examples/type_metadata/type_metadata.c | 213 ++++++++---------- examples/type_metadata/type_metadata.h | 21 +- 4 files changed, 121 insertions(+), 127 deletions(-) diff --git a/examples/type_metadata/generated/meta_types.c b/examples/type_metadata/generated/meta_types.c index 336cfad..80ae53a 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:851 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:837 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:890 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:876 TypeInfoEnumerant Shape_members[3] = { {"Circle", 6, 1}, {"Segment", 7, 2}, {"Polygon", 7, 3}, }; -// generated by W:/metadesk/examples/type_metadata/type_metadata.c:926 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:912 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}; @@ -30,7 +30,7 @@ TypeInfo RoundedSegment_type_info = {TypeKind_Struct, "RoundedSegment", 14, 3, R TypeInfo RoundedPolygon_type_info = {TypeKind_Struct, "RoundedPolygon", 14, 3, RoundedPolygon_members, 0}; TypeInfo Shape_type_info = {TypeKind_Enum, "Shape", 5, 3, Shape_members, &U32_type_info}; -// generated by W:/metadesk/examples/type_metadata/type_metadata.c:986 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:972 TypeInfo* type_info_from_shape(Shape v) { diff --git a/examples/type_metadata/generated/meta_types.h b/examples/type_metadata/generated/meta_types.h index ba57160..74939a4 100644 --- a/examples/type_metadata/generated/meta_types.h +++ b/examples/type_metadata/generated/meta_types.h @@ -1,6 +1,6 @@ #if !defined(META_TYPES_H) #define META_TYPES_H -// generated by W:/metadesk/examples/type_metadata/type_metadata.c:729 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:714 typedef struct Circle Circle; struct Circle { @@ -29,11 +29,11 @@ Shape_Segment = 2, Shape_Polygon = 3, }; -// generated by W:/metadesk/examples/type_metadata/type_metadata.c:813 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:798 TypeInfo* type_info_from_shape(Shape v); U32 max_slot_from_shape(Shape v); -// generated by W:/metadesk/examples/type_metadata/type_metadata.c:835 +// generated by W:/metadesk/examples/type_metadata/type_metadata.c:821 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 2ce0e00..6aaa3a6 100644 --- a/examples/type_metadata/type_metadata.c +++ b/examples/type_metadata/type_metadata.c @@ -97,36 +97,6 @@ gen_map_case_from_enumerant(GEN_MapInfo *map, GEN_TypeEnumerant *enumerant) return(result); } - -MD_String8 -gen_in_type_string_from_map(GEN_MapInfo *map) -{ - MD_String8 result = {0}; - if (map->types_are_good) - { - result = map->in->node->string; - } - return(result); -} - -MD_String8 -gen_out_type_string_from_map(GEN_MapInfo *map) -{ - MD_String8 result = {0}; - if (map->types_are_good) - { - if (map->out_is_type_info_ptr) - { - result = MD_S8Lit("TypeInfo*"); - } - else - { - result = map->out->node->string; - } - } - return(result); -} - //~ analyzers ///////////////////////////////////////////////////////////////// void @@ -505,38 +475,57 @@ gen_equip_map_in_out_types(void) } } - // resolve in type info - GEN_TypeInfo *in_type_info = gen_resolve_type_info_from_referencer(in_node); - if (in_type_info != 0 && - in_type_info->kind != GEN_TypeKind_Enum) + // construct type info for map + GEN_TypedMapInfo *typed_map = 0; { - MD_CodeLoc loc = MD_CodeLocFromNode(in_node); - MD_PrintMessage(error_file, loc, MD_MessageKind_Error, - MD_S8Lit("a map's In type should be an enum")); - in_type_info = 0; - } - - // resolve out type info - GEN_TypeInfo *out_type_info = gen_resolve_type_info_from_referencer(out_node); - int out_is_type_info_ptr = 0; - if (out_type_info == 0) - { - MD_String8 out_name = out_node->string; - if (MD_S8Match(out_name, MD_S8Lit("$Type"), 0)) + // resolve in type info + GEN_TypeInfo *in_type_info = gen_resolve_type_info_from_referencer(in_node); + if (in_type_info != 0 && + in_type_info->kind != GEN_TypeKind_Enum) { - out_is_type_info_ptr = 1; + MD_CodeLoc loc = MD_CodeLocFromNode(in_node); + MD_PrintMessage(error_file, loc, MD_MessageKind_Error, + MD_S8Lit("a map's In type should be an enum")); + in_type_info = 0; } - else + + // resolve out type info + GEN_TypeInfo *out_type_info = gen_resolve_type_info_from_referencer(out_node); + int out_is_type_info_ptr = 0; + if (out_type_info == 0) { - gen_type_resolve_error(out_node); + MD_String8 out_name = out_node->string; + if (MD_S8Match(out_name, MD_S8Lit("$Type"), 0)) + { + out_is_type_info_ptr = 1; + } + else + { + gen_type_resolve_error(out_node); + } + } + + // assemble typed map + if (in_type_info != 0 && (out_type_info != 0 || out_is_type_info_ptr)) + { + typed_map = MD_PushArray(arena, GEN_TypedMapInfo, 1); + + // fill primary values + typed_map->in = in_type_info; + typed_map->out = out_type_info; + typed_map->out_is_type_info_ptr = out_is_type_info_ptr; + + // fill derived values + typed_map->in_type_string = in_type_info->node->string; + if (out_is_type_info_ptr) + { + typed_map->out_type_string = MD_S8Lit("TypeInfo*"); + } + else + { + typed_map->out_type_string = out_type_info->node->string; + } } - } - - // types are good - int types_are_good = 0; - if (in_type_info != 0 && (out_type_info != 0 || out_is_type_info_ptr)) - { - types_are_good = 1; } // check for named children in the map tag @@ -545,10 +534,7 @@ gen_equip_map_in_out_types(void) MD_Node *auto_val = gen_get_child_value(map_tag, MD_S8Lit("auto")); // save to map - map->in = in_type_info; - map->out = out_type_info; - map->out_is_type_info_ptr = out_is_type_info_ptr; - map->types_are_good = types_are_good; + map->typed_map = typed_map; map->is_complete = is_complete; map->default_val = default_val; map->auto_val = auto_val; @@ -562,11 +548,12 @@ gen_equip_map_cases(void) map != 0; map = map->next) { - if (map->types_are_good) + GEN_TypedMapInfo *typed_map = map->typed_map; + if (typed_map != 0) { // get in type - GEN_TypeInfo *in_type = map->in; + GEN_TypeInfo *in_type = typed_map->in; // build the list MD_b32 got_list = 1; @@ -637,49 +624,46 @@ gen_check_duplicate_cases(void) map != 0; map = map->next) { - if (map->types_are_good) + + for (GEN_MapCase *node = map->first_case; + node != 0; + node = node->next) { - - for (GEN_MapCase *node = map->first_case; - node != 0; - node = node->next) + GEN_TypeEnumerant *enumerant = node->in_enumerant; + MD_String8 name = enumerant->node->string; + for (GEN_MapCase *check = map->first_case; + check != 0; + check = check->next) { - GEN_TypeEnumerant *enumerant = node->in_enumerant; - MD_String8 name = enumerant->node->string; - for (GEN_MapCase *check = map->first_case; - check != 0; - check = check->next) + if (node == check) { - if (node == check) - { - break; - } - if (enumerant == check->in_enumerant) - { - MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); - MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); - MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, - "'%.*s' is already defined", MD_S8VArg(name)); - MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, - "see previous definition of '%.*s'", MD_S8VArg(name)); - break; - } - if (enumerant->value == check->in_enumerant->value) - { - MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); - MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); - MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, - "'%.*s' has value %d which is already defined", - MD_S8VArg(name), enumerant->value); - MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, - "see previous definition '%.*s'", - MD_S8VArg(check->in_enumerant->node->string)); - break; - } + break; + } + if (enumerant == check->in_enumerant) + { + MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); + MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); + MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, + "'%.*s' is already defined", MD_S8VArg(name)); + MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, + "see previous definition of '%.*s'", MD_S8VArg(name)); + break; + } + if (enumerant->value == check->in_enumerant->value) + { + MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); + MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); + MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, + "'%.*s' has value %d which is already defined", + MD_S8VArg(name), enumerant->value); + MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, + "see previous definition '%.*s'", + MD_S8VArg(check->in_enumerant->node->string)); + break; } } - } + } } @@ -690,11 +674,12 @@ gen_check_complete_map_cases(void) map != 0; map = map->next) { - if (map->types_are_good && map->is_complete) + GEN_TypedMapInfo *typed_map = map->typed_map; + if (typed_map != 0 && map->is_complete) { int printed_message_for_this_map = 0; - GEN_TypeInfo *in_type = map->in; + GEN_TypeInfo *in_type = typed_map->in; for (GEN_TypeEnumerant *enumerant = in_type->first_enumerant; enumerant != 0; enumerant = enumerant->next) @@ -816,10 +801,11 @@ gen_function_declarations_from_maps(FILE *out) map != 0; map = map->next) { - if (map->types_are_good) + GEN_TypedMapInfo *typed_map = map->typed_map; + if (typed_map != 0) { - MD_String8 in_type = gen_in_type_string_from_map(map); - MD_String8 out_type = gen_out_type_string_from_map(map); + MD_String8 in_type = typed_map->in_type_string; + MD_String8 out_type = typed_map->out_type_string; fprintf(out, "%.*s %.*s(%.*s v);\n", MD_S8VArg(out_type), MD_S8VArg(map->node->string), MD_S8VArg(in_type)); @@ -989,10 +975,11 @@ gen_function_definitions_from_maps(FILE *out) map != 0; map = map->next) { - if (map->types_are_good) + GEN_TypedMapInfo *typed_map = map->typed_map; + if (typed_map != 0) { - MD_String8 in_type = gen_in_type_string_from_map(map); - MD_String8 out_type = gen_out_type_string_from_map(map); + MD_String8 in_type = typed_map->in_type_string; + MD_String8 out_type = typed_map->out_type_string; fprintf(out, "%.*s\n", MD_S8VArg(out_type)); fprintf(out, "%.*s(%.*s v)\n", MD_S8VArg(map->node->string), MD_S8VArg(in_type)); @@ -1008,13 +995,13 @@ gen_function_definitions_from_maps(FILE *out) { MD_String8 default_expr = map->default_val->string; MD_String8 val_expr = default_expr; - if (map->out_is_type_info_ptr) + if (typed_map->out_is_type_info_ptr) { val_expr = MD_S8Fmt(scratch.arena, "&%.*s_type_info", MD_S8VArg(default_expr)); } fprintf(out, "result = %.*s;\n", MD_S8VArg(val_expr)); } - else if (map->out_is_type_info_ptr) + else if (typed_map->out_is_type_info_ptr) { fprintf(out, "result = 0;\n"); } @@ -1024,7 +1011,7 @@ gen_function_definitions_from_maps(FILE *out) if (!MD_NodeIsNil(map->auto_val)) { int map_has_an_implicit_case = 0; - for (GEN_TypeEnumerant *enumerant = map->in->first_enumerant; + for (GEN_TypeEnumerant *enumerant = typed_map->in->first_enumerant; enumerant != 0; enumerant = enumerant->next) { @@ -1042,7 +1029,7 @@ gen_function_definitions_from_maps(FILE *out) { MD_String8 auto_expr = map->auto_val->string; MD_String8 val_expr = auto_expr; - if (map->out_is_type_info_ptr) + if (typed_map->out_is_type_info_ptr) { val_expr = MD_S8Fmt(scratch.arena, "&%.*s_type_info", MD_S8VArg(auto_expr)); } @@ -1061,7 +1048,7 @@ gen_function_definitions_from_maps(FILE *out) MD_String8 in_expr = map_case->in_enumerant->node->string; MD_String8 out_expr = map_case->out->string; MD_String8 val_expr = out_expr; - if (map->out_is_type_info_ptr) + if (typed_map->out_is_type_info_ptr) { val_expr = MD_S8Fmt(scratch.arena, "&%.*s_type_info", MD_S8VArg(out_expr)); } diff --git a/examples/type_metadata/type_metadata.h b/examples/type_metadata/type_metadata.h index 092a3c9..fcc62d3 100644 --- a/examples/type_metadata/type_metadata.h +++ b/examples/type_metadata/type_metadata.h @@ -63,11 +63,7 @@ struct GEN_MapInfo GEN_MapInfo *next; MD_Node *node; - // TODO(allen): fix this shit idiot - GEN_TypeInfo *in; - GEN_TypeInfo *out; - int out_is_type_info_ptr; - int types_are_good; + struct GEN_TypedMapInfo *typed_map; int is_complete; MD_Node *default_val; @@ -78,6 +74,19 @@ struct GEN_MapInfo int case_count; }; +typedef struct GEN_TypedMapInfo GEN_TypedMapInfo; +struct GEN_TypedMapInfo +{ + // primary + GEN_TypeInfo *in; + GEN_TypeInfo *out; + int out_is_type_info_ptr; + + // derived + MD_String8 in_type_string; + MD_String8 out_type_string; +}; + typedef struct GEN_MapCase GEN_MapCase; struct GEN_MapCase { @@ -97,8 +106,6 @@ void gen_type_resolve_error(MD_Node *reference); GEN_TypeEnumerant* gen_enumerant_from_name(GEN_TypeInfo *enum_type, MD_String8 name); GEN_MapCase* gen_map_case_from_enumerant(GEN_MapInfo *map, GEN_TypeEnumerant *enumerant); -MD_String8 gen_in_type_string_from_map(GEN_MapInfo *map); -MD_String8 gen_out_type_string_from_map(GEN_MapInfo *map); //~ analyzers ///////////////////////////////////////////////////////////////// void gen_gather_types_and_maps(MD_Node *list);