else {
struct address *addr = SUB_MAKEFUNC(address)();
if (addr) {
- switch (ctxt->ctxt_type) {
+ int type = ctxt_type(ctxt);
+ switch (type) {
case ELT_HEAD_SOUR_CORP:
ADDFUNC2_NOLIST(header,address)(ctxt, addr); break;
case ELT_SUB_FAM_EVT:
case REC_SUBM:
ADDFUNC2_NOLIST(submitter,address)(ctxt, addr); break;
default:
- UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+ UNEXPECTED_CONTEXT(type);
}
result = MAKE_GOM_CTXT(elt, address, addr);
}
if (! ctxt)
NO_CONTEXT;
else {
- result = make_gom_ctxt(elt, ctxt->ctxt_type, ctxt->ctxt_ptr);
+ result = dup_gom_ctxt(ctxt, elt);
}
return (Gedcom_ctxt)result;
}
DEFINE_SUB_MAKEFUNC(address)
-DEFINE_SUB_ADDFUNC(address)
+DEFINE_SUB_SETFUNC(address)
DEFINE_SUB_DELETEFUNC(address)
DEFINE_STRING_END_CB(address, sub_addr_end, full_label)
NO_CONTEXT;
else {
char *str = GEDCOM_STRING(parsed_value);
- switch (ctxt->ctxt_type) {
+ int type = ctxt_type(ctxt);
+ switch (type) {
case ELT_HEAD_SOUR_CORP:
header_add_phone(ctxt, str); break;
case ELT_SUB_FAM_EVT:
case REC_SUBM:
submitter_add_phone(ctxt, str); break;
default:
- UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+ UNEXPECTED_CONTEXT(type);
}
- result = make_gom_ctxt(elt, ctxt->obj_type, ctxt->ctxt_ptr);
+ result = dup_gom_ctxt(ctxt, elt);
}
return (Gedcom_ctxt)result;
}