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] fix bug in case iteration

Browse Source
This commit is contained in:
Allen Webster
2021-09-26 10:44:46 -07:00
parent 4a1f9529a0
commit 64b2075038
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/type_metadata/generated/meta_types.c
+12 -4
View File
@@ -1,4 +1,4 @@
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:775 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:773
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:814 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:812
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:850 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:848
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:910 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:908
TypeInfo* TypeInfo*
type_info_from_shape(Shape v) type_info_from_shape(Shape v)
{ {
@@ -42,6 +42,14 @@ case Shape_Circle:
{ {
result = &Circle_type_info; result = &Circle_type_info;
}break; }break;
case Shape_Segment:
{
result = &RoundedSegment_type_info;
}break;
case Shape_Polygon:
{
result = &RoundedPolygon_type_info;
}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:644 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:642
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:728 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:726
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:759 // generated by W:/metadesk/examples/type_metadata/type_metadata.c:757
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
+2 -4
View File
@@ -531,12 +531,10 @@ gen_equip_map_cases(void)
MD_Node *map_root_node = map->node; MD_Node *map_root_node = map->node;
for (MD_Node *case_node = map_root_node->first_child, *next = 0; for (MD_Node *case_node = map_root_node->first_child;
!MD_NodeIsNil(case_node); !MD_NodeIsNil(case_node);
case_node = next) case_node = MD_FirstNodeWithFlags(case_node->next, MD_NodeFlag_IsAfterComma))
{ {
MD_Node *next = MD_FirstNodeWithFlags(case_node, MD_NodeFlag_IsAfterComma);
// extract in & out // extract in & out
MD_Node *in = case_node; MD_Node *in = case_node;
MD_Node *arrow = in->next; MD_Node *arrow = in->next;