[example] resolve map's case in value to an enumerant pointer

This commit is contained in:
Allen Webster
2021-09-25 21:55:26 -07:00
parent 1d204361e6
commit 7b830bc584
4 changed files with 49 additions and 14 deletions
@@ -1,4 +1,4 @@
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:744
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:776
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:783
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:815
TypeInfoEnumerant Shape_members[3] = {
{"Circle", 6, 1},
{"Segment", 7, 2},
{"Polygon", 7, 3},
};
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:819
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:851
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};
@@ -1,6 +1,6 @@
#if !defined(META_TYPES_H)
#define META_TYPES_H
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:612
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:644
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:696
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:728
TypeInfo* type_info_from_shape(Shape v);
U32 max_slot_from_shape(Shape v);
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:728
// generated by W:/metadesk/examples/type_metadata/type_metadata.c:760
extern TypeInfo U32_type_info;
extern TypeInfo F32_type_info;
extern TypeInfo V2F32_type_info;
+39 -7
View File
@@ -63,6 +63,24 @@ gen_type_resolve_error(MD_Node *reference)
"could not resolve type name '%.*s'", MD_S8VArg(reference->string));
}
GEN_TypeEnumerant*
gen_enumerant_from_name(GEN_TypeInfo *enum_type, MD_String8 name)
{
GEN_TypeEnumerant *result = 0;
for (GEN_TypeEnumerant *enumerant = enum_type->first_enumerant;
enumerant != 0;
enumerant = enumerant->next)
{
if (MD_S8Match(name, enumerant->node->string, 0))
{
result = enumerant;
break;
}
}
return(result);
}
//~ analyzers /////////////////////////////////////////////////////////////////
void
@@ -533,8 +551,9 @@ gen_equip_map_cases(void)
goto skip_case;
}
// check that in is a value of in_type
if (!MD_NodeHasChild(in_type->node, in->string, 0))
// get enumerant from in_type
GEN_TypeEnumerant *in_enumerant = gen_enumerant_from_name(in_type, in->string);
if (in_enumerant == 0)
{
MD_CodeLoc loc = MD_CodeLocFromNode(in);
MD_PrintMessageFmt(error_file, loc, MD_MessageKind_Error,
@@ -548,7 +567,7 @@ gen_equip_map_cases(void)
if (got_list)
{
GEN_MapCase *map_case = MD_PushArray(arena, GEN_MapCase, 1);
map_case->in = in;
map_case->in_enumerant = in_enumerant;
map_case->out = out;
MD_QueuePush(first_case, last_case, map_case);
case_count += 1;
@@ -580,7 +599,8 @@ gen_check_duplicate_cases(void)
node != 0;
node = node->next)
{
MD_String8 name = node->in->string;
GEN_TypeEnumerant *enumerant = node->in_enumerant;
MD_String8 name = enumerant->node->string;
for (GEN_MapCase *check = map->first_case;
check != 0;
check = check->next)
@@ -589,16 +609,28 @@ gen_check_duplicate_cases(void)
{
break;
}
if (MD_S8Match(name, check->in->string, 0))
if (enumerant == check->in_enumerant)
{
MD_CodeLoc my_loc = MD_CodeLocFromNode(node->in);
MD_CodeLoc og_loc = MD_CodeLocFromNode(check->in);
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;
}
}
}
}
+4 -1
View File
@@ -81,17 +81,20 @@ typedef struct GEN_MapCase GEN_MapCase;
struct GEN_MapCase
{
GEN_MapCase *next;
MD_Node *in;
GEN_TypeEnumerant *in_enumerant;
MD_Node *out;
};
//~ helpers ///////////////////////////////////////////////////////////////////
MD_Node* gen_get_child_value(MD_Node *parent, MD_String8 child_name);
GEN_TypeInfo* gen_resolve_type_info_from_string(MD_String8 name);
GEN_TypeInfo* gen_resolve_type_info_from_referencer(MD_Node *reference);
void gen_type_resolve_error(MD_Node *reference);
GEN_TypeEnumerant* gen_enumerant_from_name(GEN_TypeInfo *enum_type, MD_String8 name);
//~ analyzers /////////////////////////////////////////////////////////////////
void gen_gather_types_and_maps(MD_Node *list);
void gen_check_duplicate_member_names(void);