X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gom%2Fgom.c;h=e00af9a948317ef57c9046643113eeee0a21b40b;hb=60162324857b1e8d84b8346d99f8b7dce07d0d40;hp=6ca25d234ed2a5ebcef91c9e3b9b60ce38febe4d;hpb=bb2090762d3ae9355a04286c33b78d24736b783c;p=gedcom-parse.git diff --git a/gom/gom.c b/gom/gom.c index 6ca25d2..e00af9a 100644 --- a/gom/gom.c +++ b/gom/gom.c @@ -111,6 +111,7 @@ int gom_parse_file(const char* file_name) gom_cleanup(); } else { + gedcom_set_compat_options(COMPAT_ALLOW_OUT_OF_CONTEXT); subscribe_all(); } gom_active = 1; @@ -165,35 +166,12 @@ int gom_write_xref_list(Gedcom_write_hndl hndl, return result; } -Gom_ctxt make_gom_ctxt(int ctxt_type, OBJ_TYPE obj_type, void *ctxt_ptr) -{ - Gom_ctxt ctxt = (Gom_ctxt)malloc(sizeof(struct Gom_ctxt_struct)); - if (! ctxt) - MEMORY_ERROR; - else { - ctxt->ctxt_type = ctxt_type; - ctxt->obj_type = obj_type; - ctxt->ctxt_ptr = ctxt_ptr; - } - return ctxt; -} - -void NULL_DESTROY(void* anything UNUSED) -{ -} - -void destroy_gom_ctxt(Gom_ctxt ctxt) -{ - SAFE_FREE(ctxt); -} - -void gom_cast_error(const char* file, int line, - OBJ_TYPE expected, OBJ_TYPE found) +void gom_default_callback (Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED, + int level, char* tag, char* raw_value, + int parsed_tag UNUSED) { - fprintf(stderr, - "Wrong gom ctxt cast at %s, line %d: expected %d, found %d\n", - file, line, expected, found); - abort(); + gedcom_warning(_("Data loss in import: \"%d %s %s\""), + level, tag, raw_value); } void gom_mem_error(const char *filename, int line) @@ -206,18 +184,6 @@ void gom_xref_already_in_use(const char *xrefstr) gedcom_error(_("Cross-reference key '%s' is already in use"), xrefstr); } -void gom_unexpected_context(const char* file, int line, OBJ_TYPE found) -{ - gedcom_warning(_("Internal error: Unexpected context at %s, line %d: %d"), - file, line, found); -} - -void gom_no_context(const char* file, int line) -{ - gedcom_warning(_("Internal error: No context at %s, line %d"), - file, line); -} - void gom_move_error(const char* type) { gedcom_warning(_("Could not move struct of type %s"), type); @@ -228,28 +194,6 @@ void gom_find_error(const char* type) gedcom_warning(_("Could not find struct of type %s in chain"), type); } -void gom_default_callback (Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED, - int level, char* tag, char* raw_value, - int parsed_tag UNUSED) -{ - gedcom_warning(_("Data loss in import: \"%d %s %s\""), - level, tag, raw_value); -} - -void def_rec_end(Gedcom_rec rec UNUSED, Gedcom_ctxt self, - Gedcom_val parsed_value UNUSED) -{ - Gom_ctxt ctxt = (Gom_ctxt)self; - destroy_gom_ctxt(ctxt); -} - -void def_elt_end(Gedcom_elt elt UNUSED, Gedcom_ctxt parent UNUSED, - Gedcom_ctxt self, Gedcom_val parsed_value UNUSED) -{ - Gom_ctxt ctxt = (Gom_ctxt)self; - destroy_gom_ctxt(ctxt); -} - void set_xref_type(struct xref_value* xr, const char *str) { if (!strcasecmp(str, "FAM"))