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

[examples] implement 'complete' feature for maps

Browse Source
This commit is contained in:
Allen Webster
2021-09-26 11:08:30 -07:00
parent fcb61541a9
commit cdbf239c34
4 changed files with 100 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/type_metadata/generated/meta_types.c
+8 -8
View File
@@ -1,4 +1,4 @@
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:773 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:826
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:812 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:865
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:848 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:901
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};
@@ -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 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}; TypeInfo Shape_type_info = {TypeKind_Enum, "Shape", 5, 3, Shape_members, &U32_type_info};
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:908 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:961
TypeInfo* TypeInfo*
type_info_from_shape(Shape v) type_info_from_shape(Shape v)
{ {
@@ -66,15 +66,15 @@ default:
{ {
result = 0; result = 0;
}break; }break;
case Shape_Polygon:
{
result = 12;
}break;
case Shape_Circle: case Shape_Circle:
case Shape_Segment: case Shape_Segment:
{ {
result = 64; result = 64;
}break; }break;
case Shape_Polygon:
{
result = 12;
}break;
} }
return(result); return(result);
} }
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:642 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:695
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:726 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:779
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:757 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:810
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
+88 -34
View File
@@ -592,44 +592,97 @@ gen_check_duplicate_cases(void)
map != 0; map != 0;
map = map->next) map = map->next)
{ {
if (map->types_are_good)
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 *node = map->first_case;
for (GEN_MapCase *check = map->first_case; node != 0;
check != 0; node = node->next)
check = check->next)
{ {
if (node == check) GEN_TypeEnumerant *enumerant = node->in_enumerant;
MD_String8 name = enumerant->node->string;
for (GEN_MapCase *check = map->first_case;
check != 0;
check = check->next)
{ {
break; if (node == check)
} {
if (enumerant == check->in_enumerant) break;
{ }
MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); if (enumerant == check->in_enumerant)
MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); {
MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node);
"'%.*s' is already defined", MD_S8VArg(name)); MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node);
MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error,
"see previous definition of '%.*s'", MD_S8VArg(name)); "'%.*s' is already defined", MD_S8VArg(name));
break; MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note,
} "see previous definition of '%.*s'", MD_S8VArg(name));
if (enumerant->value == check->in_enumerant->value) break;
{ }
MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node); if (enumerant->value == check->in_enumerant->value)
MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node); {
MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error, MD_CodeLoc my_loc = MD_CodeLocFromNode(enumerant->node);
"'%.*s' has value %d which is already defined", MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in_enumerant->node);
MD_S8VArg(name), enumerant->value); MD_PrintMessageFmt(error_file, my_loc, MD_MessageKind_Error,
MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note, "'%.*s' has value %d which is already defined",
"see previous definition '%.*s'", MD_S8VArg(name), enumerant->value);
MD_S8VArg(check->in_enumerant->node->string)); MD_PrintMessageFmt(error_file, og_loc, MD_MessageKind_Note,
break; "see previous definition '%.*s'",
MD_S8VArg(check->in_enumerant->node->string));
break;
}
} }
} }
}
}
}
void
gen_check_complete_map_cases(void)
{
for (GEN_MapInfo *map = first_map;
map != 0;
map = map->next)
{
if (map->types_are_good && map->is_complete)
{
int printed_message_for_this_map = 0;
GEN_TypeInfo *in_type = map->in;
for (GEN_TypeEnumerant *enumerant = in_type->first_enumerant;
enumerant != 0;
enumerant = enumerant->next)
{
// TODO deduplicate
int enumerant_has_case = 0;
for (GEN_MapCase *map_case = map->first_case;
map_case != 0;
map_case = map_case->next)
{
if (map_case->in_enumerant == enumerant)
{
enumerant_has_case = 1;
break;
}
}
if (!enumerant_has_case)
{
if (!printed_message_for_this_map)
{
printed_message_for_this_map = 1;
MD_CodeLoc map_loc = MD_CodeLocFromNode(map->node);
MD_PrintMessage(error_file, map_loc, MD_MessageKind_Warning,
MD_S8Lit("map marked as complete is missing a case (or more)"));
}
MD_String8 enumerant_name = enumerant->node->string;
MD_CodeLoc enumerant_loc = MD_CodeLocFromNode(enumerant->node);
MD_PrintMessageFmt(error_file, enumerant_loc, MD_MessageKind_Note,
"see enumerant '%.*s'", MD_S8VArg(enumerant_name));
}
}
} }
} }
} }
@@ -959,6 +1012,7 @@ gen_function_definitions_from_maps(FILE *out)
enumerant != 0; enumerant != 0;
enumerant = enumerant->next) enumerant = enumerant->next)
{ {
// TODO deduplicate
int enumerant_has_explicit_case = 0; int enumerant_has_explicit_case = 0;
for (GEN_MapCase *map_case = map->first_case; for (GEN_MapCase *map_case = map->first_case;
map_case != 0; map_case != 0;
@@ -1078,7 +1132,7 @@ main(int argc, char **argv)
gen_equip_map_in_out_types(); gen_equip_map_in_out_types();
gen_equip_map_cases(); gen_equip_map_cases();
gen_check_duplicate_cases(); gen_check_duplicate_cases();
// TODO check 'complete' gen_check_complete_map_cases();
// generate header file // generate header file
{ {
examples/type_metadata/type_metadata.h
+1
View File
@@ -105,6 +105,7 @@ void gen_equip_enum_members(void);
void gen_equip_map_in_out_types(void); void gen_equip_map_in_out_types(void);
void gen_equip_map_cases(void); void gen_equip_map_cases(void);
void gen_check_duplicate_cases(void); void gen_check_duplicate_cases(void);
void gen_check_complete_map_cases(void);
//~ generators //////////////////////////////////////////////////////////////// //~ generators ////////////////////////////////////////////////////////////////
void gen_type_definitions_from_types(FILE *out); void gen_type_definitions_from_types(FILE *out);