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

fix mutable eval root key stability w.r.t. view rules & so on

Browse Source
This commit is contained in:
Ryan Fleury
2024-02-06 13:28:14 -08:00
parent 86e332f2ef
commit e3f18d3b87
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/core/df_core.c
+2 -2
View File
@@ -5431,8 +5431,8 @@ df_eval_viz_block_list_from_eval_view_expr_num(Arena *arena, DBGI_Scope *scope,
ProfBeginFunction(); ProfBeginFunction();
DF_EvalVizBlockList blocks = {0}; DF_EvalVizBlockList blocks = {0};
{ {
DF_ExpandKey start_parent_key = df_expand_key_make(5381, 0); DF_ExpandKey start_parent_key = df_expand_key_make(5381, num);
DF_ExpandKey start_key = df_expand_key_make(df_hash_from_expand_key(start_parent_key), num); DF_ExpandKey start_key = df_expand_key_make(df_hash_from_expand_key(start_parent_key), df_hash_from_string(expr));
DF_Eval eval = df_eval_from_string(arena, scope, ctrl_ctx, parse_ctx, macro_map, expr); DF_Eval eval = df_eval_from_string(arena, scope, ctrl_ctx, parse_ctx, macro_map, expr);
U64 expr_comma_pos = str8_find_needle(expr, 0, str8_lit(","), 0); U64 expr_comma_pos = str8_find_needle(expr, 0, str8_lit(","), 0);
String8List default_view_rules = {0}; String8List default_view_rules = {0};
src/df/gfx/df_views.c
+6 -8
View File
@@ -608,12 +608,11 @@ internal DF_EvalRoot *
df_eval_root_from_expand_key(DF_EvalWatchViewState *ews, DF_EvalView *eval_view, DF_ExpandKey expand_key) df_eval_root_from_expand_key(DF_EvalWatchViewState *ews, DF_EvalView *eval_view, DF_ExpandKey expand_key)
{ {
DF_EvalRoot *root = 0; DF_EvalRoot *root = 0;
DF_ExpandKey parent_key = df_expand_key_make(5381, 0); for(DF_EvalRoot *r = ews->first_root; r != 0; r = r->next)
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
U64 num = 1;
for(DF_EvalRoot *r = ews->first_root; r != 0; r = r->next, num += 1)
{ {
DF_ExpandKey key = df_expand_key_make(parent_key_hash, num); DF_ExpandKey parent_key = df_expand_key_make(5381, (U64)r);
U64 parent_key_hash = df_hash_from_expand_key(parent_key);
DF_ExpandKey key = df_expand_key_make(parent_key_hash, df_hash_from_string(df_string_from_eval_root(r)));
if(df_expand_key_match(key, expand_key)) if(df_expand_key_match(key, expand_key))
{ {
root = r; root = r;
@@ -650,14 +649,13 @@ df_eval_viz_block_list_from_watch_view_state(Arena *arena, DBGI_Scope *scope, DF
default: default:
case DF_EvalWatchViewFillKind_Mutable: case DF_EvalWatchViewFillKind_Mutable:
{ {
U64 num = 1; for(DF_EvalRoot *root = ews->first_root; root != 0; root = root->next)
for(DF_EvalRoot *root = ews->first_root; root != 0; root = root->next, num += 1)
{ {
String8 root_expr_string = df_string_from_eval_root(root); String8 root_expr_string = df_string_from_eval_root(root);
FuzzyMatchRangeList matches = fuzzy_match_find(arena, filter, root_expr_string); FuzzyMatchRangeList matches = fuzzy_match_find(arena, filter, root_expr_string);
if(matches.count == matches.needle_part_count) if(matches.count == matches.needle_part_count)
{ {
DF_EvalVizBlockList root_blocks = df_eval_viz_block_list_from_eval_view_expr_num(arena, scope, ctrl_ctx, parse_ctx, macro_map, eval_view, root_expr_string, num); DF_EvalVizBlockList root_blocks = df_eval_viz_block_list_from_eval_view_expr_num(arena, scope, ctrl_ctx, parse_ctx, macro_map, eval_view, root_expr_string, (U64)root);
df_eval_viz_block_list_concat__in_place(&blocks, &root_blocks); df_eval_viz_block_list_concat__in_place(&blocks, &root_blocks);
} }
} }