1 files changed, 15 insertions, 20 deletions

diff --git a/src/lib/eolian/database_var.c b/src/lib/eolian/database_var.c
index d0870c3f34..a6eea20cdf 100644
--- a/src/lib/eolian/database_var.c
+++ b/src/lib/eolian/database_var.c
@@ -8,43 +8,38 @@
 void
 database_var_del(Eolian_Variable *var)
 {
-   if (!var) return;
-   const char *sp;
-   if (var->base.file) eina_stringshare_del(var->base.file);
+   if (!var || eolian_object_unref(&var->base)) return;
+   eina_stringshare_del(var->base.file);
+   eina_stringshare_del(var->base.name);
    if (var->base_type)
      database_type_del(var->base_type);
-   if (var->name) eina_stringshare_del(var->name);
-   if (var->full_name) eina_stringshare_del(var->full_name);
-   if (var->namespaces) EINA_LIST_FREE(var->namespaces, sp)
-      eina_stringshare_del(sp);
    if (var->value) database_expr_del(var->value);
    database_doc_del(var->doc);
    free(var);
 }
 
 static void
-database_var_global_add(Eolian *state, Eolian_Variable *var)
+database_var_global_add(Eolian_Unit *unit, Eolian_Variable *var)
 {
-   eina_hash_set(state->unit.globals, var->full_name, var);
-   eina_hash_set(state->globals_f, var->base.file, eina_list_append
-                 ((Eina_List*)eina_hash_find(state->globals_f, var->base.file), var));
-   database_decl_add(state, var->full_name, EOLIAN_DECL_VAR, var->base.file, var);
+   EOLIAN_OBJECT_ADD(unit, var->base.name, var, globals);
+   eina_hash_set(unit->state->staging.globals_f, var->base.file, eina_list_append
+                 ((Eina_List*)eina_hash_find(unit->state->staging.globals_f, var->base.file), var));
 }
 
 static void
-database_var_constant_add(Eolian *state, Eolian_Variable *var)
+database_var_constant_add(Eolian_Unit *unit, Eolian_Variable *var)
 {
-   eina_hash_set(state->unit.constants, var->full_name, var);
-   eina_hash_set(state->constants_f, var->base.file, eina_list_append
-                 ((Eina_List*)eina_hash_find(state->constants_f, var->base.file), var));
-   database_decl_add(state, var->full_name, EOLIAN_DECL_VAR, var->base.file, var);
+   EOLIAN_OBJECT_ADD(unit, var->base.name, var, constants);
+   eina_hash_set(unit->state->staging.constants_f, var->base.file, eina_list_append
+                 ((Eina_List*)eina_hash_find(unit->state->staging.constants_f, var->base.file), var));
 }
 
 void
-database_var_add(Eolian *state, Eolian_Variable *var)
+database_var_add(Eolian_Unit *unit, Eolian_Variable *var)
 {
    if (var->type == EOLIAN_VAR_GLOBAL)
-     database_var_global_add(state, var);
+     database_var_global_add(unit, var);
    else
-     database_var_constant_add(state, var);
+     database_var_constant_add(unit, var);
+   database_object_add(unit, &var->base);
 }