eliminate machine/file entities in frontend layer

This commit is contained in:
Ryan Fleury
2024-12-06 13:53:25 -08:00
parent 87a1dd84ec
commit bca1325d9a
5 changed files with 12 additions and 66 deletions
+6 -18
View File
@@ -36,12 +36,10 @@ RD_CmdKind_Null,
RD_CmdKind_Null,
};
String8 d_entity_kind_display_string_table[29] =
String8 d_entity_kind_display_string_table[27] =
{
str8_lit_comp("Nil"),
str8_lit_comp("Root"),
str8_lit_comp("Machine"),
str8_lit_comp("File"),
str8_lit_comp("Auto View Rule"),
str8_lit_comp("File Path Map"),
str8_lit_comp("Watch Pin"),
@@ -69,12 +67,10 @@ str8_lit_comp("Conversion Task"),
str8_lit_comp("Conversion Failure"),
};
String8 d_entity_kind_name_lower_table[29] =
String8 d_entity_kind_name_lower_table[27] =
{
str8_lit_comp("nil"),
str8_lit_comp("root"),
str8_lit_comp("machine"),
str8_lit_comp("file"),
str8_lit_comp("auto_view_rule"),
str8_lit_comp("file_path_map"),
str8_lit_comp("watch_pin"),
@@ -102,12 +98,10 @@ str8_lit_comp("conversion_task"),
str8_lit_comp("conversion_fail"),
};
String8 d_entity_kind_name_lower_plural_table[29] =
String8 d_entity_kind_name_lower_plural_table[27] =
{
str8_lit_comp("nils"),
str8_lit_comp("roots"),
str8_lit_comp("machines"),
str8_lit_comp("files"),
str8_lit_comp("auto_view_rules"),
str8_lit_comp("file_path_maps"),
str8_lit_comp("watch_pins"),
@@ -135,14 +129,12 @@ str8_lit_comp("conversion_tasks"),
str8_lit_comp("conversion_fails"),
};
String8 d_entity_kind_name_label_table[29] =
String8 d_entity_kind_name_label_table[27] =
{
str8_lit_comp("Label"),
str8_lit_comp("Label"),
str8_lit_comp("Label"),
str8_lit_comp("Label"),
str8_lit_comp("Label"),
str8_lit_comp("Label"),
str8_lit_comp("Expression"),
str8_lit_comp("Expression"),
str8_lit_comp("Expression"),
@@ -168,12 +160,10 @@ str8_lit_comp("Label"),
str8_lit_comp("Label"),
};
RD_EntityKindFlags rd_entity_kind_flags_table[29] =
RD_EntityKindFlags rd_entity_kind_flags_table[27] =
{
(0*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (0*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (0*RD_EntityKindFlag_UserDefinedLifetime) | (0*RD_EntityKindFlag_IsSerializedToConfig),
(0*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (0*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (0*RD_EntityKindFlag_UserDefinedLifetime) | (0*RD_EntityKindFlag_IsSerializedToConfig),
(0*RD_EntityKindFlag_CanDelete) | (1*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (1*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (0*RD_EntityKindFlag_UserDefinedLifetime) | (0*RD_EntityKindFlag_IsSerializedToConfig),
(0*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (0*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (0*RD_EntityKindFlag_UserDefinedLifetime) | (0*RD_EntityKindFlag_IsSerializedToConfig),
(1*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (0*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (1*RD_EntityKindFlag_UserDefinedLifetime) | (1*RD_EntityKindFlag_IsSerializedToConfig),
(1*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (0*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (0*RD_EntityKindFlag_CanDuplicate) | (0*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (0*RD_EntityKindFlag_UserDefinedLifetime) | (1*RD_EntityKindFlag_IsSerializedToConfig),
(1*RD_EntityKindFlag_CanDelete) | (0*RD_EntityKindFlag_CanFreeze) | (0*RD_EntityKindFlag_CanEdit) | (1*RD_EntityKindFlag_CanRename) | (0*RD_EntityKindFlag_CanEnable) | (0*RD_EntityKindFlag_CanCondition) | (1*RD_EntityKindFlag_CanDuplicate) | (1*RD_EntityKindFlag_NameIsCode) | (0*RD_EntityKindFlag_NameIsPath) | (1*RD_EntityKindFlag_UserDefinedLifetime) | (1*RD_EntityKindFlag_IsSerializedToConfig),
@@ -860,12 +850,10 @@ RD_ViewRuleInfo rd_view_rule_kind_info_table[35] =
{str8_lit_comp("geo3d"), str8_lit_comp("Visualizes memory as 3D geometry."), str8_lit_comp("Geometry (3D)"), str8_lit_comp("x:{'count':expr, 'vtx':expr, 'vtx_size':expr}"), RD_IconKind_Binoculars, (RD_ViewRuleInfoFlag_ShowInDocs*1|RD_ViewRuleInfoFlag_CanFilter*0|RD_ViewRuleInfoFlag_FilterIsCode*0|RD_ViewRuleInfoFlag_TypingAutomaticallyFilters*0|RD_ViewRuleInfoFlag_CanUseInWatchTable*1|RD_ViewRuleInfoFlag_CanFillValueCell*0|RD_ViewRuleInfoFlag_CanExpand*1), EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_NAME(geo3d) , RD_VIEW_RULE_UI_FUNCTION_NAME(geo3d)},
};
RD_IconKind rd_entity_kind_icon_kind_table[29] =
RD_IconKind rd_entity_kind_icon_kind_table[27] =
{
RD_IconKind_Null,
RD_IconKind_Null,
RD_IconKind_Machine,
RD_IconKind_FileOutline,
RD_IconKind_Binoculars,
RD_IconKind_FileOutline,
RD_IconKind_Pin,
+6 -8
View File
@@ -19,8 +19,6 @@ typedef enum RD_EntityKind
{
RD_EntityKind_Nil,
RD_EntityKind_Root,
RD_EntityKind_Machine,
RD_EntityKind_File,
RD_EntityKind_AutoViewRule,
RD_EntityKind_FilePathMap,
RD_EntityKind_WatchPin,
@@ -761,11 +759,11 @@ extern String8 rd_cfg_src_string_table[4];
extern RD_CmdKind rd_cfg_src_load_cmd_kind_table[4];
extern RD_CmdKind rd_cfg_src_write_cmd_kind_table[4];
extern RD_CmdKind rd_cfg_src_apply_cmd_kind_table[4];
extern String8 d_entity_kind_display_string_table[29];
extern String8 d_entity_kind_name_lower_table[29];
extern String8 d_entity_kind_name_lower_plural_table[29];
extern String8 d_entity_kind_name_label_table[29];
extern RD_EntityKindFlags rd_entity_kind_flags_table[29];
extern String8 d_entity_kind_display_string_table[27];
extern String8 d_entity_kind_name_lower_table[27];
extern String8 d_entity_kind_name_lower_plural_table[27];
extern String8 d_entity_kind_name_label_table[27];
extern RD_EntityKindFlags rd_entity_kind_flags_table[27];
extern Rng1U64 rd_reg_slot_range_table[34];
extern RD_StringBindingPair rd_default_binding_table[110];
extern String8 rd_binding_version_remap_old_name_table[8];
@@ -779,7 +777,7 @@ extern EV_ViewRuleExprExpandRangeInfoHookFunctionType * rd_collection_expr_expan
extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_id_from_num_hook_function_table[18];
extern EV_ViewRuleExprExpandIDFromNumHookFunctionType * rd_collection_expr_expand_num_from_id_hook_function_table[18];
extern RD_ViewRuleInfo rd_view_rule_kind_info_table[35];
extern RD_IconKind rd_entity_kind_icon_kind_table[29];
extern RD_IconKind rd_entity_kind_icon_kind_table[27];
extern String8 rd_theme_preset_display_string_table[9];
extern String8 rd_theme_preset_code_string_table[9];
extern String8 rd_theme_color_version_remap_old_name_table[22];
-6
View File
@@ -63,12 +63,6 @@ RD_EntityKindTable:
{Nil nil nils 0 0 0 0 0 0 0 0 0 0 0 "Label" Null "Nil" }
{Root root roots 0 0 0 0 0 0 0 0 0 0 0 "Label" Null "Root" }
//- rjf: machines
{Machine machine machines 0 1 0 1 0 0 0 0 0 0 0 "Label" Machine "Machine" }
//- rjf: filesystem modeling
{File file files 0 0 0 0 0 0 0 0 0 0 0 "Label" FileOutline "File" }
//- rjf: auto view rules
{AutoViewRule auto_view_rule auto_view_rules 1 0 0 0 0 0 0 0 0 1 1 "Label" Binoculars "Auto View Rule" }
-31
View File
@@ -327,30 +327,6 @@ rd_entity_array_from_list(Arena *arena, RD_EntityList *list)
return result;
}
//- rjf: full path building, from file/folder entities
internal String8
rd_full_path_from_entity(Arena *arena, RD_Entity *entity)
{
String8 string = {0};
{
Temp scratch = scratch_begin(&arena, 1);
String8List strs = {0};
for(RD_Entity *e = entity; !rd_entity_is_nil(e); e = e->parent)
{
if(e->kind == RD_EntityKind_File)
{
str8_list_push_front(scratch.arena, &strs, e->string);
}
}
StringJoin join = {0};
join.sep = str8_lit("/");
string = str8_list_join(arena, &strs, &join);
scratch_end(scratch);
}
return string;
}
//- rjf: display string entities, for referencing entities in ui
internal String8
@@ -11393,13 +11369,6 @@ rd_init(CmdLine *cmdln)
rd_state->top_regs = &rd_state->base_regs;
rd_clear_bindings();
// rjf: set up initial entities
{
RD_Entity *local_machine = rd_entity_alloc(rd_state->entities_root, RD_EntityKind_Machine);
rd_entity_equip_ctrl_handle(local_machine, ctrl_handle_make(CTRL_MachineID_Local, dmn_handle_zero()));
rd_entity_equip_name(local_machine, str8_lit("This PC"));
}
// rjf: set up user / project paths
{
Temp scratch = scratch_begin(0, 0);
-3
View File
@@ -1071,9 +1071,6 @@ internal void rd_entity_list_push(Arena *arena, RD_EntityList *list, RD_Entity *
internal RD_EntityArray rd_entity_array_from_list(Arena *arena, RD_EntityList *list);
#define rd_first_entity_from_list(list) ((list)->first != 0 ? (list)->first->entity : &d_nil_entity)
//- rjf: full path building, from file/folder entities
internal String8 rd_full_path_from_entity(Arena *arena, RD_Entity *entity);
//- rjf: display string entities, for referencing entities in ui
internal String8 rd_display_string_from_entity(Arena *arena, RD_Entity *entity);