first pass at watch expr location locks - still some jank around the edges due to eval incompleteness, but works for basic cases

This commit is contained in:
Ryan Fleury committed 2026-07-28 11:18:00 -07:00
1 parent ae8960d563
commit 0fe5aa5a43
11 files changed
+258 -149

No files matched your search

@@ -208,8 +208,6 @@ ev_view_alloc(void)
view->arena = arena;
view->expand_slots_count = 256;
view->expand_slots = push_array(arena, EV_ExpandSlot, view->expand_slots_count);
view->key_view_rule_slots_count = 256;
view->key_view_rule_slots = push_array(arena, EV_KeyViewRuleSlot, view->key_view_rule_slots_count);
return view;
}
@@ -246,36 +244,6 @@ ev_expansion_from_key(EV_View *view, EV_Key key)
return (node != 0 && node->expanded);
}
internal String8
ev_view_rule_from_key(EV_View *view, EV_Key key)
{
String8 result = {0};
//- rjf: key -> hash * slot idx * slot
U64 hash = ev_hash_from_key(key);
U64 slot_idx = hash%view->key_view_rule_slots_count;
EV_KeyViewRuleSlot *slot = &view->key_view_rule_slots[slot_idx];
//- rjf: slot -> existing node
EV_KeyViewRuleNode *existing_node = 0;
for(EV_KeyViewRuleNode *n = slot->first; n != 0; n = n->hash_next)
{
if(ev_key_match(n->key, key))
{
existing_node = n;
break;
}
}
//- rjf: node -> result
if(existing_node != 0)
{
result = str8(existing_node->buffer, existing_node->buffer_string_size);
}
return result;
}
internal void
ev_key_set_expansion(EV_View *view, EV_Key parent_key, EV_Key key, B32 expanded)
{
@@ -348,44 +316,6 @@ ev_key_set_expansion(EV_View *view, EV_Key parent_key, EV_Key key, B32 expanded)
}
}
internal void
ev_key_set_view_rule(EV_View *view, EV_Key key, String8 view_rule_string)
{
//- rjf: key -> hash * slot idx * slot
U64 hash = ev_hash_from_key(key);
U64 slot_idx = hash%view->key_view_rule_slots_count;
EV_KeyViewRuleSlot *slot = &view->key_view_rule_slots[slot_idx];
//- rjf: slot -> existing node
EV_KeyViewRuleNode *existing_node = 0;
for(EV_KeyViewRuleNode *n = slot->first; n != 0; n = n->hash_next)
{
if(ev_key_match(n->key, key))
{
existing_node = n;
break;
}
}
//- rjf: existing node * new node -> node
EV_KeyViewRuleNode *node = existing_node;
if(node == 0)
{
node = push_array(view->arena, EV_KeyViewRuleNode, 1);
DLLPushBack_NP(slot->first, slot->last, node, hash_next, hash_prev);
node->key = key;
node->buffer_cap = 512;
node->buffer = push_array(view->arena, U8, node->buffer_cap);
}
//- rjf: mutate node
if(node != 0)
{
node->buffer_string_size = ClampTop(view_rule_string.size, node->buffer_cap);
MemoryCopy(node->buffer, view_rule_string.str, node->buffer_string_size);
}
}
////////////////////////////////
//~ rjf: View Rule Info Table Building / Selection / Lookups
@@ -40,26 +40,6 @@ struct EV_ExpandSlot
EV_ExpandNode *last;
};
//- rjf: hash table for view rules
typedef struct EV_KeyViewRuleNode EV_KeyViewRuleNode;
struct EV_KeyViewRuleNode
{
EV_KeyViewRuleNode *hash_next;
EV_KeyViewRuleNode *hash_prev;
EV_Key key;
U8 *buffer;
U64 buffer_cap;
U64 buffer_string_size;
};
typedef struct EV_KeyViewRuleSlot EV_KeyViewRuleSlot;
struct EV_KeyViewRuleSlot
{
EV_KeyViewRuleNode *first;
EV_KeyViewRuleNode *last;
};
//- rjf: view state bundle
typedef struct EV_View EV_View;
@@ -69,9 +49,6 @@ struct EV_View
EV_ExpandSlot *expand_slots;
U64 expand_slots_count;
EV_ExpandNode *free_expand_node;
EV_KeyViewRuleSlot *key_view_rule_slots;
U64 key_view_rule_slots_count;
EV_KeyViewRuleNode *free_key_view_rule_node;
};
////////////////////////////////
@@ -328,9 +305,7 @@ internal void ev_view_release(EV_View *view);
//- rjf: lookups / mutations
internal EV_ExpandNode *ev_expand_node_from_key(EV_View *view, EV_Key key);
internal B32 ev_expansion_from_key(EV_View *view, EV_Key key);
internal String8 ev_view_rule_from_key(EV_View *view, EV_Key key);
internal void ev_key_set_expansion(EV_View *view, EV_Key parent_key, EV_Key key, B32 expanded);
internal void ev_key_set_view_rule(EV_View *view, EV_Key key, String8 view_rule_string);
////////////////////////////////
//~ rjf: View Rule Info Table Building / Selection / Lookups