ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nil sentinel setup

This commit is contained in:
Allen Webster 2020-12-30 15:58:38 -08:00
parent 3904b21826
commit 5a0865d4dd
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
custom/4coder_variables.cpp
View File

@ -15,8 +15,7 @@ global String_ID vars_string_id_counter = 0;
function void function void
_vars_init(void){ _vars_init(void){
local_persist b32 did_init = false; local_persist b32 did_init = false;
if (!did_init) if (!did_init){
{
did_init = true; did_init = true;
Base_Allocator *base = get_base_allocator_system(); Base_Allocator *base = get_base_allocator_system();
vars_arena = make_arena(base); vars_arena = make_arena(base);
@ -71,18 +70,38 @@ global Variable *vars_free_variables = 0;
function Variable_Handle function Variable_Handle
vars_get_root(void){ vars_get_root(void){
Variable_Handle handle = {&vars_global_root}; Variable_Handle handle = {&vars_global_root};
local_persist b32 first_call = true;
if (first_call){
first_call = false;
Variable *nil = vars_get_nil().ptr;
vars_global_root.parent = nil;
vars_global_root.next = nil;
vars_global_root.first = nil;
vars_global_root.last = nil;
}
return(handle); return(handle);
} }
function Variable_Handle function Variable_Handle
vars_get_nil(void){ vars_get_nil(void){
Variable_Handle handle = {&vars_nil}; Variable_Handle handle = {&vars_nil};
if (vars_nil.parent == 0){
vars_nil.parent = &vars_nil;
vars_nil.next = &vars_nil;
vars_nil.first = &vars_nil;
vars_nil.last = &vars_nil;
}
return(handle); return(handle);
} }
function b32 function b32
vars_is_nil(Variable_Handle var){ vars_is_nil(Variable_Handle var){
return(var.ptr == 0 || var.ptr == &vars_nil); return(var.ptr == &vars_nil);
}
function b32
vars_is_nil(Variable* ptr) {
return(ptr == &vars_nil);
} }
function b32 function b32
@ -92,25 +111,13 @@ vars_match(Variable_Handle a, Variable_Handle b){
function Variable_Handle function Variable_Handle
vars_first_child(Variable_Handle var){ vars_first_child(Variable_Handle var){
Variable_Handle result = {}; Variable_Handle result = {var.ptr->first};
if (var.ptr != 0){
result.ptr = var.ptr->first;
}
else{
result.ptr = &vars_nil;
}
return(result); return(result);
} }
function Variable_Handle function Variable_Handle
vars_next_sibling(Variable_Handle var){ vars_next_sibling(Variable_Handle var){
Variable_Handle result = {}; Variable_Handle result = {var.ptr->next};
if (var.ptr != 0){
result.ptr = var.ptr->next;
}
else{
result.ptr = &vars_nil;
}
return(result); return(result);
} }
@ -169,7 +176,7 @@ function Variable_Handle
vars_read_key(Variable_Handle var, String_ID key){ vars_read_key(Variable_Handle var, String_ID key){
Variable_Handle result = vars_get_nil(); Variable_Handle result = vars_get_nil();
for (Variable *node = var.ptr->first; for (Variable *node = var.ptr->first;
node != 0; !vars_is_nil(node);
node = node->next){ node = node->next){
if (node->key == key){ if (node->key == key){
result.ptr = node; result.ptr = node;
@ -202,15 +209,13 @@ vars_set_string(Variable_Handle var, String_Const_u8 string){
function void function void
_vars_free_variable_children(Variable *var){ _vars_free_variable_children(Variable *var){
for (Variable *node = var->first; for (Variable *node = var->first;
node != 0; !vars_is_nil(node);
node = node->next){ node = node->next){
_vars_free_variable_children(node); _vars_free_variable_children(node);
} }
if (var->last != 0){ if (!vars_is_nil(var->first)){
var->last->next = vars_free_variables; var->last->next = vars_free_variables;
}
if (var->first != 0){
vars_free_variables = var->first; vars_free_variables = var->first;
} }
} }
@ -218,9 +223,9 @@ _vars_free_variable_children(Variable *var){
function void function void
vars_erase(Variable_Handle var, String_ID key){ vars_erase(Variable_Handle var, String_ID key){
if (var.ptr != &vars_nil){ if (var.ptr != &vars_nil){
Variable *prev = 0; Variable *prev = vars_get_nil().ptr;
Variable *node = var.ptr->first; Variable *node = var.ptr->first;
for (; node != 0; for (; vars_is_nil(node);
node = node->next){ node = node->next){
if (node->key == key){ if (node->key == key){
break; break;
@ -228,9 +233,9 @@ vars_erase(Variable_Handle var, String_ID key){
prev = node; prev = node;
} }
if (node != 0){ if (!vars_is_nil(node)){
_vars_free_variable_children(node); _vars_free_variable_children(node);
if (prev != 0){ if (!vars_is_nil(prev)){
prev->next = node->next; prev->next = node->next;
} }
if (var.ptr->first == node){ if (var.ptr->first == node){
@ -248,9 +253,9 @@ function Variable_Handle
vars_new_variable(Variable_Handle var, String_ID key){ vars_new_variable(Variable_Handle var, String_ID key){
Variable_Handle handle = vars_get_nil(); Variable_Handle handle = vars_get_nil();
if (var.ptr != &vars_nil){ if (var.ptr != &vars_nil){
Variable *prev = 0; Variable *prev = vars_get_nil().ptr;
Variable *node = var.ptr->first; Variable *node = var.ptr->first;
for (; node != 0; for (; !vars_is_nil(node);
node = node->next){ node = node->next){
if (node->key == key){ if (node->key == key){
break; break;
@ -258,7 +263,7 @@ vars_new_variable(Variable_Handle var, String_ID key){
prev = node; prev = node;
} }
if (node != 0){ if (!vars_is_nil(node)){
handle.ptr = node; handle.ptr = node;
_vars_free_variable_children(node); _vars_free_variable_children(node);
} }
@ -270,13 +275,19 @@ vars_new_variable(Variable_Handle var, String_ID key){
else{ else{
handle.ptr = push_array(&vars_arena, Variable, 1); handle.ptr = push_array(&vars_arena, Variable, 1);
} }
sll_queue_push(var.ptr->first, var.ptr->last, handle.ptr); if (vars_is_nil(var.ptr->first)){
var.ptr->first = var.ptr->last = handle.ptr;
}
else{
var.ptr->last->next = handle.ptr;
var.ptr->last = handle.ptr;
}
handle.ptr->next = vars_get_nil().ptr;
handle.ptr->key = key; handle.ptr->key = key;
} }
handle.ptr->string = 0; handle.ptr->string = 0;
handle.ptr->first = 0; handle.ptr->first = handle.ptr->last = vars_get_nil().ptr;
handle.ptr->last = 0;
} }
return(handle); return(handle);
} }

2
custom/4coder_variables.h
View File

@ -13,6 +13,7 @@
typedef u64 String_ID; typedef u64 String_ID;
struct Variable{ struct Variable{
Variable *parent;
Variable *next; Variable *next;
String_ID key; String_ID key;
String_ID string; String_ID string;
@ -34,6 +35,7 @@ function String_Const_u8 vars_read_string(Arena *arena, String_ID id);
function Variable_Handle vars_get_root(void); function Variable_Handle vars_get_root(void);
function Variable_Handle vars_get_nil(void); function Variable_Handle vars_get_nil(void);
function b32 vars_is_nil(Variable_Handle var); function b32 vars_is_nil(Variable_Handle var);
function b32 vars_is_nil(Variable *var);
function b32 vars_match(Variable_Handle a, Variable_Handle b); function b32 vars_match(Variable_Handle a, Variable_Handle b);
function Variable_Handle vars_first_child(Variable_Handle var); function Variable_Handle vars_first_child(Variable_Handle var);