[examples] equip enums with underlying basic types

examples/type_metadata/generated/meta_types.c

@@ -1,4 +1,4 @@
-// generated by W:/metadesk/examples/type_metadata/type_metadata.c:457
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:500
 TypeInfoMember Circle_members[2] = {
 {"r", 1, -1, &F32_type_info},
 {"pos", 3, -1, &V2F32_type_info},
@@ -14,19 +14,19 @@ TypeInfoMember RoundedPolygon_members[3] = {
 {"p", 1, 1, &V2F32_type_info},
 };
 
-// generated by W:/metadesk/examples/type_metadata/type_metadata.c:496
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:539
 TypeInfoEnumerant Shape_members[3] = {
 {"Circle", 6, 1},
 {"Segment", 7, 2},
 {"Polygon", 7, 3},
 };
 
-// generated by W:/metadesk/examples/type_metadata/type_metadata.c:532
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:575
 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};
 TypeInfo Circle_type_info = {TypeKind_Struct, "Circle", 6, 2, Circle_members, 0};
 TypeInfo RoundedSegment_type_info = {TypeKind_Struct, "RoundedSegment", 14, 3, RoundedSegment_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, 0};
+TypeInfo Shape_type_info = {TypeKind_Enum, "Shape", 5, 3, Shape_members, &U32_type_info};
 

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:357
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:400
 typedef struct Circle Circle;
 struct Circle
 {
@@ -28,11 +28,11 @@ Shape_Segment = 2,
 Shape_Polygon = 3,
 } Shape;
 
-// generated by W:/metadesk/examples/type_metadata/type_metadata.c:416
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:459
 TypeInfo* type_info_from_shape(Shape v);
 U32 max_slot_from_shape(Shape v);
 
-// generated by W:/metadesk/examples/type_metadata/type_metadata.c:441
+// generated by W:/metadesk/examples/type_metadata/type_metadata.c:484
 extern TypeInfo U32_type_info;
 extern TypeInfo F32_type_info;
 extern TypeInfo V2F32_type_info;

examples/type_metadata/type_metadata.c

@@ -142,7 +142,7 @@ gen_gather_types_and_maps(MD_Node *list)
 }
 
 void
-gen_equip_basic_type_sizes(void)
+gen_equip_basic_type_size(void)
 {
     for (GEN_TypeInfo *type = first_type;
          type != 0;
@@ -216,7 +216,7 @@ gen_equip_struct_members(void)
                 
                 // has type node:
                 MD_String8 type_name = type_name_node->string;
-                MD_MapSlot *type_info_slot = (MD_MapSlot*)MD_MapLookup(&type_map, MD_MapKeyStr(type_name));
+                MD_MapSlot *type_info_slot = MD_MapLookup(&type_map, MD_MapKeyStr(type_name));
                 
                 // could not resolve type?
                 if (type_info_slot == 0)
@@ -279,6 +279,49 @@ gen_equip_struct_members(void)
     }
 }
 
+void
+gen_equip_enum_underlying_type(void)
+{
+    for (GEN_TypeInfo *type = first_type;
+         type != 0;
+         type = type->next)
+    {
+        if (type->kind == GEN_TypeKind_Enum)
+        {
+            // extract underlying type
+            GEN_TypeInfo *underlying_type = 0;
+            
+            MD_Node *type_node = type->node;
+            MD_Node *type_tag = MD_TagFromString(type_node, MD_S8Lit("type"), 0);
+            MD_Node *type_tag_param = type_tag->first_child;
+            MD_Node *underlying_type_referencer = type_tag_param->first_child;
+            if (!MD_NodeIsNil(underlying_type_referencer))
+            {
+                MD_String8 underlying_type_name = underlying_type_referencer->string;
+                MD_MapSlot *underlying_type_slot = MD_MapLookup(&type_map,
+                                                                MD_MapKeyStr(underlying_type_name));
+                if (underlying_type_slot != 0)
+                {
+                    GEN_TypeInfo *mapped_type = (GEN_TypeInfo*)underlying_type_slot->val;
+                    if (mapped_type->kind == GEN_TypeKind_Basic)
+                    {
+                        underlying_type = mapped_type;
+                    }
+                }
+                if (underlying_type == 0)
+                {
+                    MD_CodeLoc loc = MD_CodeLocFromNode(underlying_type_referencer);
+                    MD_PrintMessageFmt(error_file, loc, MD_MessageKind_Error,
+                                       "'%.*s' is not a basic type", MD_S8VArg(underlying_type_name));
+                }
+            }
+            
+            // save underlying type
+            type->underlying_type = underlying_type;
+        }
+    }
+}
+
 void
 gen_equip_enum_members(void)
 {
@@ -631,10 +674,9 @@ main(int argc, char **argv)
     // analysis phase
     gen_gather_types_and_maps(list);
     // TODO no duplicate member names check
-    // TODO basic type sizes
+    gen_equip_basic_type_size();
-    gen_equip_basic_type_sizes();
     gen_equip_struct_members();
-    // TODO check enum base types
+    gen_equip_enum_underlying_type();
     gen_equip_enum_members();
     // TODO check maps & build case lists
     

examples/type_metadata/type_metadata.h

@@ -72,8 +72,9 @@ MD_Node* gen_get_md_child_value(MD_Node *parent, MD_String8 child_name);
 
 //~ analyzers /////////////////////////////////////////////////////////////////
 void gen_gather_types_and_maps(MD_Node *list);
-void gen_equip_basic_type_sizes(void);
+void gen_equip_basic_type_size(void);
 void gen_equip_struct_members(void);
+void gen_equip_enum_underlying_type(void);
 void gen_equip_enum_members(void);
 
 //~ generators ////////////////////////////////////////////////////////////////