Skip to content

Commit 2f31591

Browse files
committed
switch off rd_cfg to cfg layer
1 parent 46634f5 commit 2f31591

File tree

13 files changed

+1341
-2210
lines changed

13 files changed

+1341
-2210
lines changed

src/config/config.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,28 @@ cfg_ctx_select(CFG_Ctx *ctx)
150150

151151
//- rjf: tree navigations
152152

153+
internal U64
154+
cfg_change_gen(void)
155+
{
156+
U64 result = 0;
157+
if(cfg_ctx != 0)
158+
{
159+
result = cfg_ctx->change_gen;
160+
}
161+
return result;
162+
}
163+
164+
internal CFG_Node *
165+
cfg_node_root(void)
166+
{
167+
CFG_Node *result = &cfg_nil_node;
168+
if(cfg_ctx != 0)
169+
{
170+
result = cfg_ctx->root;
171+
}
172+
return result;
173+
}
174+
153175
internal CFG_Node *
154176
cfg_node_from_id(CFG_ID id)
155177
{
@@ -867,7 +889,7 @@ cfg_node_ptr_list_from_string(Arena *arena, CFG_State *state, CFG_SchemaTable *s
867889
dst_active_parent_n = dst_active_parent_n->parent;
868890
}
869891
}
870-
cfg_node_list_push(arena, &result, dst_root_n);
892+
cfg_node_ptr_list_push(arena, &result, dst_root_n);
871893
}
872894
scratch_end(scratch);
873895
return result;

src/config/config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ internal MD_NodePtrList cfg_schemas_from_name(Arena *arena, CFG_SchemaTable *tab
185185
internal void cfg_ctx_select(CFG_Ctx *ctx);
186186

187187
//- rjf: tree navigations
188+
internal U64 cfg_change_gen(void);
189+
internal CFG_Node *cfg_node_root(void);
188190
internal CFG_Node *cfg_node_from_id(CFG_ID id);
189191
internal CFG_Node *cfg_node_child_from_string(CFG_Node *parent, String8 string);
190192
internal CFG_Node *cfg_node_child_from_string_or_parent(CFG_Node *parent, String8 string);

src/ctrl/ctrl_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ internal void
979979
ctrl_entity_string_release(CTRL_EntityCtxRWStore *store, String8 string)
980980
{
981981
U64 bucket_num = ctrl_name_bucket_num_from_string_size(string.size);
982-
if(1 <= bucket_num && bucket_num <= ArrayCount(rd_name_bucket_chunk_sizes))
982+
if(1 <= bucket_num && bucket_num <= ArrayCount(ctrl_entity_string_bucket_chunk_sizes))
983983
{
984984
U64 bucket_idx = bucket_num-1;
985985
CTRL_EntityStringChunkNode *node = (CTRL_EntityStringChunkNode *)string.str;

0 commit comments

Comments
 (0)