ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-05 13:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix serialization/deserialization of top-level watch view rules

Browse Source
This commit is contained in:
Ryan Fleury
2024-02-06 15:38:42 -08:00
parent fb43eb9c72
commit c757388bb4
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_views.c
+8 -10
View File
@@ -6650,20 +6650,19 @@ DF_VIEW_SETUP_FUNCTION_DEF(Watch)
// rjf: add roots for watches // rjf: add roots for watches
{ {
DF_ExpandKey parent_key = df_expand_key_make(5381, 0);
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
DF_EvalViewKey eval_view_key = df_eval_view_key_from_eval_watch_view(ewv); DF_EvalViewKey eval_view_key = df_eval_view_key_from_eval_watch_view(ewv);
DF_EvalView *eval_view = df_eval_view_from_key(eval_view_key); DF_EvalView *eval_view = df_eval_view_from_key(eval_view_key);
U64 num = 1; for(DF_CfgNode *expr = cfg_root->first; expr != &df_g_nil_cfg_node; expr = expr->next)
for(DF_CfgNode *expr = cfg_root->first; expr != &df_g_nil_cfg_node; expr = expr->next, num += 1)
{ {
if(expr->flags & DF_CfgNodeFlag_StringLiteral) if(expr->flags & DF_CfgNodeFlag_StringLiteral)
{ {
DF_EvalRoot *root = df_eval_root_alloc(view, ewv); DF_EvalRoot *root = df_eval_root_alloc(view, ewv);
DF_ExpandKey parent_key = df_expand_key_make(5381, (U64)root);
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
df_eval_root_equip_string(root, expr->string); df_eval_root_equip_string(root, expr->string);
if(expr->first != &df_g_nil_cfg_node) if(expr->first != &df_g_nil_cfg_node)
{ {
DF_ExpandKey root_key = df_expand_key_make(parent_key_hash, num); DF_ExpandKey root_key = df_expand_key_make(parent_key_hash, df_hash_from_string(expr->string));
String8 view_rule = expr->first->string; String8 view_rule = expr->first->string;
df_eval_view_set_key_rule(eval_view, root_key, view_rule); df_eval_view_set_key_rule(eval_view, root_key, view_rule);
} }
@@ -6682,14 +6681,13 @@ DF_VIEW_STRING_FROM_STATE_FUNCTION_DEF(Watch)
DF_EvalViewKey eval_view_key = df_eval_view_key_from_eval_watch_view(ewv); DF_EvalViewKey eval_view_key = df_eval_view_key_from_eval_watch_view(ewv);
DF_EvalView *eval_view = df_eval_view_from_key(eval_view_key); DF_EvalView *eval_view = df_eval_view_from_key(eval_view_key);
{ {
DF_ExpandKey parent_key = df_expand_key_make(5381, 0); for(DF_EvalRoot *root = ewv->first_root; root != 0; root = root->next)
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
U64 num = 1;
for(DF_EvalRoot *root = ewv->first_root; root != 0; root = root->next, num += 1)
{ {
DF_ExpandKey parent_key = df_expand_key_make(5381, (U64)root);
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
String8 string = df_string_from_eval_root(root); String8 string = df_string_from_eval_root(root);
str8_list_pushf(arena, &strs, "\"%S\"", string); str8_list_pushf(arena, &strs, "\"%S\"", string);
DF_ExpandKey root_key = df_expand_key_make(parent_key_hash, num); DF_ExpandKey root_key = df_expand_key_make(parent_key_hash, df_hash_from_string(string));
String8 view_rule = df_eval_view_rule_from_key(eval_view, root_key); String8 view_rule = df_eval_view_rule_from_key(eval_view, root_key);
if(view_rule.size != 0) if(view_rule.size != 0)
{ {