Allow elements out of context.

[gedcom-parse.git] / gom / association.c

diff --git a/gom/association.c b/gom/association.c
index 7c7ec68abb890ff01639354219d582dcae3bf3f7..dc45c06324fa32a810c80a542d8270155e3dac56 100644 (file)
--- a/gom/association.c
+++ b/gom/association.c
@@ -40,19 +40,16 @@ Gedcom_ctxt sub_assoc_start(_ELT_PARAMS_)
   if (!ctxt)
     NO_CONTEXT;
   else {
-    struct association *assoc;
-    assoc = (struct association *)malloc(sizeof(struct association));
-    if (! assoc)
-      MEMORY_ERROR;
-    else {
-      memset (assoc, 0, sizeof(struct association));
+    struct association *assoc = SUB_MAKEFUNC(association)();
+    if (assoc) {
+      int type = ctxt_type(ctxt);
       assoc->to = GEDCOM_XREF_PTR(parsed_value);
-      
-      switch (ctxt->ctxt_type) {
+
+      switch (type) {
        case REC_INDI:
          ADDFUNC2(individual,association)(ctxt, assoc);
        default:
-         UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+         UNEXPECTED_CONTEXT(type);
       }
       result = MAKE_GOM_CTXT(elt, association, assoc);
     }
@@ -61,6 +58,12 @@ Gedcom_ctxt sub_assoc_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
+DEFINE_SUB_MAKEFUNC(association)
+DEFINE_SUB_ADDFUNC(association)
+DEFINE_SUB_FINDFUNC(association)
+DEFINE_SUB_REMOVEFUNC(association)
+DEFINE_SUB_MOVEFUNC(association)
+     
 DEFINE_STRING_CB(association, sub_assoc_rela_start, relation)
 
 DEFINE_ADDFUNC2(association, note_sub, note)
@@ -99,6 +102,19 @@ void association_subscribe()
                              def_elt_end);
 }
 
+void UNREFALLFUNC(association)(struct association *obj)
+{
+  if (obj) {
+    struct association* runner;
+    for (runner = obj; runner; runner = runner->next) {
+      unref_xref_value(runner->to);
+      UNREFALLFUNC(source_citation)(runner->citation);
+      UNREFALLFUNC(note_sub)(runner->note);
+      UNREFALLFUNC(user_data)(runner->extra);
+    }
+  }
+}
+
 void CLEANFUNC(association)(struct association* assoc)
 {
   if (assoc) {