ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-07 08:08:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[examples] check case values when building case lists

Browse Source
This commit is contained in:
Allen Webster
2021-09-25 21:35:51 -07:00
parent 7feed9ea6a
commit b203d0ac67
3 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/type_metadata/generated/meta_types.c
+3 -3
View File
@@ -1,4 +1,4 @@
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:693 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:707
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:732 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:746
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:768 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:782
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};
examples/type_metadata/generated/meta_types.h
+3 -3
View File
@@ -1,6 +1,6 @@
#if !defined(META_TYPES_H) #if !defined(META_TYPES_H)
#define META_TYPES_H #define META_TYPES_H
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:561 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:575
typedef struct Circle Circle; typedef struct Circle Circle;
struct Circle struct Circle
{ {
@@ -29,11 +29,11 @@ Shape_Segment = 2,
Shape_Polygon = 3, Shape_Polygon = 3,
}; };
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:645 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:659
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:677 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:691
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;
examples/type_metadata/type_metadata.c
+15 -1
View File
@@ -500,6 +500,10 @@ gen_equip_map_cases(void)
map = map->next) map = map->next)
{ {
if (map->types_are_good)
{
GEN_TypeInfo *in_type = map->in;
// build the list // build the list
MD_b32 got_list = 1; MD_b32 got_list = 1;
GEN_MapCase *first_case = 0; GEN_MapCase *first_case = 0;
@@ -528,7 +532,16 @@ gen_equip_map_cases(void)
goto skip_case; goto skip_case;
} }
// TODO check in is a value of in type // check that in is a value of in_type
if (!MD_NodeHasChild(in_type->node, in->string, 0))
{
MD_CodeLoc loc = MD_CodeLocFromNode(in);
MD_PrintMessageFmt(error_file, loc, MD_MessageKind_Error,
"'%.*s' is not a value in the enum '%.*s'",
MD_S8VArg(in->string), MD_S8VArg(in_type->node->string));
got_list = 0;
goto skip_case;
}
// save case // save case
if (got_list) if (got_list)
@@ -551,6 +564,7 @@ gen_equip_map_cases(void)
map->case_count = case_count; map->case_count = case_count;
} }
} }
}
} }
//~ generators //////////////////////////////////////////////////////////////// //~ generators ////////////////////////////////////////////////////////////////