metagen: simplify enum generation; reading/organization pass over raddbgi_from_pdb

src/df/core/df_core.mdesk

@@ -1688,59 +1688,49 @@ DF_DevToggleTable:
 
 //- rjf: enums
 
-@table_gen_enum
-DF_CfgSrc:
+@enum DF_CfgSrc:
 {
-  @expand(DF_CfgSrcTable a) `DF_CfgSrc_$(a.name),`;
-  `DF_CfgSrc_COUNT`;
+  @expand(DF_CfgSrcTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_EntityKind:
+@enum DF_EntityKind:
 {
-  @expand(DF_EntityKindTable a) `DF_EntityKind_$(a.name),`;
-  `DF_EntityKind_COUNT`;
+  @expand(DF_EntityKindTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_NameKind:
+@enum DF_NameKind:
 {
-  @expand(DF_NameKindTable, a) `DF_NameKind_$(a.name),`;
-  `DF_NameKind_COUNT`;
+  @expand(DF_NameKindTable, a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_CoreCmdKind:
+@enum DF_CoreCmdKind:
 {
-  @expand(DF_CoreCmdTable, a)
-    `DF_CoreCmdKind_$(a.name),`,
-  `DF_CoreCmdKind_COUNT`,
+  @expand(DF_CoreCmdTable, a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_IconKind:
+@enum DF_IconKind:
 {
-  @expand(DF_IconTable a)
-    `DF_IconKind_$(a.name),`;
-  `DF_IconKind_COUNT`;
+  @expand(DF_IconTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_CoreViewRuleKind:
+@enum DF_CoreViewRuleKind:
 {
-  @expand(DF_CoreViewRuleTable a) `DF_CoreViewRuleKind_$(a.name),`;
-  `DF_CoreViewRuleKind_COUNT`;
+  @expand(DF_CoreViewRuleTable a) `$(a.name)`,
+  COUNT,
 }
 
 //- rjf: command params
 
-@table_gen_enum
-DF_CmdParamSlot:
+@enum DF_CmdParamSlot:
 {
-  `DF_CmdParamSlot_Null,`;
-  @expand(DF_CmdParamSlotTable a)
-    `DF_CmdParamSlot_$(a.name),`;
-  `DF_CmdParamSlot_COUNT`;
+  Null,
+  @expand(DF_CmdParamSlotTable a) `$(a.name)`,
+  COUNT,
 }
 
 @table_gen

src/df/core/generated/df_core.meta.h

@@ -12,7 +12,7 @@ DF_CfgSrc_User,
 DF_CfgSrc_Profile,
 DF_CfgSrc_CommandLine,
 DF_CfgSrc_Transient,
-DF_CfgSrc_COUNT
+DF_CfgSrc_COUNT,
 } DF_CfgSrc;
 
 typedef enum DF_EntityKind
@@ -44,7 +44,7 @@ DF_EntityKind_PendingThreadName,
 DF_EntityKind_ConversionTask,
 DF_EntityKind_ConversionFail,
 DF_EntityKind_EndedProcess,
-DF_EntityKind_COUNT
+DF_EntityKind_COUNT,
 } DF_EntityKind;
 
 typedef enum DF_NameKind
@@ -52,7 +52,7 @@ typedef enum DF_NameKind
 DF_NameKind_Null,
 DF_NameKind_EntityName,
 DF_NameKind_EntityKindName,
-DF_NameKind_COUNT
+DF_NameKind_COUNT,
 } DF_NameKind;
 
 typedef enum DF_CoreCmdKind
@@ -263,7 +263,7 @@ DF_CoreCmdKind_PickFileOrFolder,
 DF_CoreCmdKind_CompleteQuery,
 DF_CoreCmdKind_CancelQuery,
 DF_CoreCmdKind_ToggleDevMenu,
-DF_CoreCmdKind_COUNT
+DF_CoreCmdKind_COUNT,
 } DF_CoreCmdKind;
 
 typedef enum DF_IconKind
@@ -337,7 +337,7 @@ DF_IconKind_QuestionMark,
 DF_IconKind_Person,
 DF_IconKind_Briefcase,
 DF_IconKind_Dot,
-DF_IconKind_COUNT
+DF_IconKind_COUNT,
 } DF_IconKind;
 
 typedef enum DF_CoreViewRuleKind
@@ -358,7 +358,7 @@ DF_CoreViewRuleKind_Text,
 DF_CoreViewRuleKind_Disasm,
 DF_CoreViewRuleKind_Bitmap,
 DF_CoreViewRuleKind_Geo,
-DF_CoreViewRuleKind_COUNT
+DF_CoreViewRuleKind_COUNT,
 } DF_CoreViewRuleKind;
 
 typedef enum DF_CmdParamSlot
@@ -382,7 +382,7 @@ DF_CmdParamSlot_Index,
 DF_CmdParamSlot_ID,
 DF_CmdParamSlot_PreferDisassembly,
 DF_CmdParamSlot_ForceConfirm,
-DF_CmdParamSlot_COUNT
+DF_CmdParamSlot_COUNT,
 } DF_CmdParamSlot;
 
 typedef struct DF_CmdParams DF_CmdParams;

src/df/gfx/df_gfx.mdesk

@@ -400,28 +400,22 @@ DF_ThemePresetColorTable:
 
 //- rjf: enums
 
-@table_gen_enum
-DF_GfxViewKind:
+@enum DF_GfxViewKind:
 {
-  @expand(DF_GfxViewTable a)
-    `DF_GfxViewKind_$(a.name),`
-    `DF_GfxViewKind_COUNT`;
+  @expand(DF_GfxViewTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_ThemeColor:
+@enum DF_ThemeColor:
 {
-  @expand(DF_ThemeTable, a)
-    `DF_ThemeColor_$(a.name),`;
-  `DF_ThemeColor_COUNT`;
+  @expand(DF_ThemeTable a) `$(a.name)`,
+  COUNT,
 }
 
-@table_gen_enum
-DF_ThemePreset:
+@enum DF_ThemePreset:
 {
-  @expand(DF_ThemePresetTable a)
-    `DF_ThemePreset_$(a.name),`;
-  `DF_ThemePreset_COUNT`;
+  @expand(DF_ThemePresetTable a) `$(a.name)`,
+  COUNT,
 }
 
 //- rjf: theme preset color tables

src/df/gfx/generated/df_gfx.meta.h

@@ -37,7 +37,7 @@ DF_GfxViewKind_Breakpoints,
 DF_GfxViewKind_WatchPins,
 DF_GfxViewKind_ExceptionFilters,
 DF_GfxViewKind_Theme,
-DF_GfxViewKind_COUNT
+DF_GfxViewKind_COUNT,
 } DF_GfxViewKind;
 
 typedef enum DF_ThemeColor
@@ -95,7 +95,7 @@ DF_ThemeColor_Thread7,
 DF_ThemeColor_ThreadUnwound,
 DF_ThemeColor_InactivePanelOverlay,
 DF_ThemeColor_DropShadow,
-DF_ThemeColor_COUNT
+DF_ThemeColor_COUNT,
 } DF_ThemeColor;
 
 typedef enum DF_ThemePreset
@@ -109,7 +109,7 @@ DF_ThemePreset_SolarizedLight,
 DF_ThemePreset_HandmadeHero,
 DF_ThemePreset_FourCoder,
 DF_ThemePreset_FarManager,
-DF_ThemePreset_COUNT
+DF_ThemePreset_COUNT,
 } DF_ThemePreset;
 
 DF_VIEW_SETUP_FUNCTION_DEF(Null);