X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=5448c74b89e26a3d6207e0fa33b37f9b5cb86aae;hb=6103dd898c4de86c68891cc0222543988a2caab7;hp=eff626732a8920856544c1e445c45fd0283e195b;hpb=8c92a223c34fbd674f26520fb990c64a7b2f9147;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index eff6267..5448c74 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -146,64 +146,78 @@ #include "encoding.h" #include "interface.h" #include "date.h" +#include "age.h" +#include "xref.h" +#include "compat.h" +#include "buffer.h" int count_level = 0; int fail = 0; -int compat_enabled = 1; int gedcom_high_level_debug = 0; -int compatibility = 0; Gedcom_err_mech error_mechanism = IMMED_FAIL; -Gedcom_val_struct val; - -char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1]; -char *line_item_buf_ptr; +Gedcom_val_struct val1; +Gedcom_val_struct val2; + +void cleanup_line_item_buffer(); +struct safe_buffer line_item_buffer = { NULL, 0, NULL, 0, + cleanup_line_item_buffer }; -enum _COMPAT { - C_FTREE = 0x01 -}; +void cleanup_concat_buffer(); +struct safe_buffer concat_buffer = { NULL, 0, NULL, 0, cleanup_concat_buffer }; +void cleanup_usertag_buffer(); +struct safe_buffer usertag_buffer = { NULL, 0, NULL, 0, + cleanup_usertag_buffer}; + /* These are defined at the bottom of the file */ -void push_countarray(); -void set_parenttag(char* tag); -char* get_parenttag(); +void push_countarray(int level); +void set_parenttag(const char* tag); +char* get_parenttag(int offset); void set_parentctxt(Gedcom_ctxt ctxt); -Gedcom_ctxt get_parentctxt(); +Gedcom_ctxt get_parentctxt(int offset); void pop_countarray(); int count_tag(int tag); int check_occurrence(int tag); -void set_compatibility(char* program); -int compat_mode(int flags); +void clean_up(); -#define CLEAR_BUFFER(BUF) \ - memset(BUF, 0, sizeof(BUF)); - #define HANDLE_ERROR \ { if (error_mechanism == IMMED_FAIL) { \ - YYABORT; \ + clean_up(); YYABORT; \ } \ else if (error_mechanism == DEFER_FAIL) { \ + gedcom_debug_print("Fail on line %d", line_no); \ yyerrok; fail = 1; \ } \ else if (error_mechanism == IGNORE_ERRORS) { \ yyerrok; \ } \ } -#define START(PARENTTAG,PARENTCTXT) \ - { ++count_level; \ - set_parenttag(#PARENTTAG); \ - set_parentctxt(PARENTCTXT); \ - push_countarray(); \ +#define START1(PARENTTAG) \ + { set_parenttag(#PARENTTAG); \ + } +#define START2(LEVEL,PARENTCTXT) \ + { set_parentctxt(PARENTCTXT); \ + ++count_level; \ + push_countarray(LEVEL); \ + } +#define START(PARENTTAG,LEVEL,PARENTCTXT) \ + { START1(PARENTTAG); \ + START2(LEVEL,PARENTCTXT); \ } -#define PARENT \ - get_parentctxt() +#define PARENT \ + get_parentctxt(0) +#define GRANDPARENT(OFF) \ + get_parentctxt(OFF) #define CHK(TAG) \ { if (!check_occurrence(TAG_##TAG)) { \ - char* parenttag = get_parenttag(); \ + char* parenttag = get_parenttag(0); \ gedcom_error(_("The tag '%s' is mandatory within '%s', but missing"),\ #TAG, parenttag); \ HANDLE_ERROR; \ } \ } +#define CHK_COND(TAG) \ + check_occurrence(TAG_##TAG) #define POP \ { pop_countarray(); \ --count_level; \ @@ -220,14 +234,14 @@ int compat_mode(int flags); #define OCCUR2(CHILDTAG, MIN, MAX) \ { int num = count_tag(TAG_##CHILDTAG); \ if (num > MAX) { \ - char* parenttag = get_parenttag(); \ + char* parenttag = get_parenttag(0); \ gedcom_error(_("The tag '%s' can maximally occur %d time(s) within '%s'"), \ #CHILDTAG, MAX, parenttag); \ HANDLE_ERROR; \ } \ } #define INVALID_TAG(CHILDTAG) \ - { char* parenttag = get_parenttag(); \ + { char* parenttag = get_parenttag(0); \ gedcom_error(_("The tag '%s' is not a valid tag within '%s'"), \ CHILDTAG, parenttag); \ HANDLE_ERROR; \ @@ -248,7 +262,7 @@ int compat_mode(int flags); } %token_table -%expect 300 +%expect 317 %token BADTOKEN %token OPEN @@ -396,7 +410,6 @@ int compat_mode(int flags); %type indiv_gen_tag %type lio_bapl_tag %type line_item -%type line_value %type mand_line_item %type mand_pointer %type note_line_item @@ -409,7 +422,13 @@ int compat_mode(int flags); %% file : head_sect records trlr_sect - { if (fail == 1) YYABORT; } + { compat_close(); + if (fail == 1) YYABORT; + } + | error + { compat_close(); + clean_up(); + } ; records : /* empty */ @@ -431,16 +450,31 @@ record : fam_rec /**** Header ****/ /*********************************************************************/ head_sect : OPEN DELIM TAG_HEAD - { $$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(), $3); - START(HEAD, $$) } + { $$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1), + $3, + NULL, GEDCOM_MAKE_NULL(val2)); + START(HEAD, $1, $$) } head_subs - { if (compat_mode(C_FTREE)) - CHECK3(SOUR, GEDC, CHAR) - else - CHECK4(SOUR, SUBM, GEDC, CHAR) + { if (compat_mode(C_NO_SUBMITTER) && ! CHK_COND(SUBM)) + compat_generate_submitter_link($4); + else CHK(SUBM); + + if (compat_mode(C_NO_GEDC) && ! CHK_COND(GEDC)) + compat_generate_gedcom($4); + else CHK(GEDC); + + if (compat_mode(C_NO_CHAR) && ! CHK_COND(CHAR)) { + if (compat_generate_char($4)) HANDLE_ERROR; + } + else CHK(CHAR); + + CHECK1(SOUR); } CLOSE - { end_record(REC_HEAD, $4); } + { end_record(REC_HEAD, $4, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_NO_SUBMITTER)) + compat_generate_submitter(); + } ; head_subs : /* empty */ @@ -450,6 +484,9 @@ head_subs : /* empty */ head_sub : head_sour_sect { OCCUR2(SOUR, 1, 1) } | head_dest_sect { OCCUR2(DEST, 0, 1) } | head_date_sect { OCCUR2(DATE, 0, 1) } + | head_time_sect { if (!compat_mode(C_HEAD_TIME)) + INVALID_TAG("TIME"); + OCCUR2(TIME, 0, 1) } | head_subm_sect { OCCUR2(SUBM, 1, 1) } | head_subn_sect { OCCUR2(SUBN, 0, 1) } | head_file_sect { OCCUR2(FILE, 0, 1) } @@ -464,16 +501,18 @@ head_sub : head_sour_sect { OCCUR2(SOUR, 1, 1) } /* HEAD.SOUR */ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item - { set_compatibility($4); + { set_compatibility_program($4); $$ = start_element(ELT_HEAD_SOUR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SOUR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(SOUR, $1, $$) } head_sour_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_SOUR, PARENT, $5, NULL); } + { compute_compatibility(); + end_element(ELT_HEAD_SOUR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; head_sour_subs : /* empty */ @@ -488,42 +527,43 @@ head_sour_sub : head_sour_vers_sect { OCCUR2(VERS, 0, 1) } ; head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item - { $$ = start_element(ELT_HEAD_SOUR_VERS, PARENT, + { set_compatibility_version($4); + $$ = start_element(ELT_HEAD_SOUR_VERS, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(VERS, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(VERS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_VERS, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_HEAD_SOUR_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NAME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NAME, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_NAME, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item { $$ = start_element(ELT_HEAD_SOUR_CORP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CORP, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(CORP, $1, $$) } head_sour_corp_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_CORP, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -538,14 +578,14 @@ head_sour_corp_sub : addr_struc_sub /* 0:1 */ head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item { $$ = start_element(ELT_HEAD_SOUR_DATA, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(DATA, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(DATA, $1, $$) } head_sour_data_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -560,29 +600,33 @@ head_sour_data_sub : head_sour_data_date_sect { OCCUR2(DATE, 0, 1) } head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_HEAD_SOUR_DATA_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + $$ + = start_element(ELT_HEAD_SOUR_DATA_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA_DATE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item - { $$ = start_element(ELT_HEAD_SOUR_DATA_COPR, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(COPR, $$) + { $$ + = start_element(ELT_HEAD_SOUR_DATA_COPR, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(COPR, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA_COPR, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -590,14 +634,14 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item head_dest_sect : OPEN DELIM TAG_DEST mand_line_item { $$ = start_element(ELT_HEAD_DEST, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(DEST, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(DEST, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_DEST, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -606,14 +650,16 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_HEAD_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + GEDCOM_MAKE_DATE(val1, dv)); + if (compat_mode(C_HEAD_TIME)) + compat_save_head_date_context($$); + START(DATE, $1, $$) } head_date_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_DATE, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -628,82 +674,110 @@ head_date_sub : head_date_time_sect { OCCUR2(TIME, 0, 1) } head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { $$ = start_element(ELT_HEAD_DATE_TIME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TIME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TIME, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_DATE_TIME, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; +/* HEAD.TIME (Only for compatibility) */ +head_time_sect : OPEN DELIM TAG_TIME opt_line_item + { if (compat_mode(C_HEAD_TIME)) { + $$ = compat_generate_head_time_start($1, $3, $4); + } + } + CLOSE + { if (compat_mode (C_HEAD_TIME)) { + compat_generate_head_time_end($5); + } + } + ; + /* HEAD.SUBM */ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_HEAD_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_HEAD_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SUBM, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SUBM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.SUBN */ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer - { $$ = start_element(ELT_HEAD_SUBN, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBN); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_HEAD_SUBN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SUBN, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SUBN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBN, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.FILE */ head_file_sect : OPEN DELIM TAG_FILE mand_line_item { $$ = start_element(ELT_HEAD_FILE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FILE, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(FILE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_FILE, PARENT, $5, NULL); + { end_element(ELT_HEAD_FILE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.COPR */ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item { $$ = start_element(ELT_HEAD_COPR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(COPR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(COPR, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_COPR, PARENT, $5, NULL); + { end_element(ELT_HEAD_COPR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.GEDC */ head_gedc_sect : OPEN DELIM TAG_GEDC { $$ = start_element(ELT_HEAD_GEDC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(GEDC, $$) + GEDCOM_MAKE_NULL(val1)); + START(GEDC, $1, $$) } head_gedc_subs - { CHECK2(VERS, FORM) } + { if (compat_mode(C_NO_GEDC_FORM) && ! CHK_COND(FORM)) + compat_generate_gedcom_form($4); + else CHK(FORM); + + CHECK1(VERS) + } + CLOSE - { end_element(ELT_HEAD_GEDC, PARENT, $4, NULL); + { end_element(ELT_HEAD_GEDC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -718,42 +792,45 @@ head_gedc_sub : head_gedc_vers_sect { OCCUR2(VERS, 1, 1) } head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_GEDC_VERS, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(VERS, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(VERS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_GEDC_VERS, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_HEAD_GEDC_FORM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FORM, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_GEDC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.CHAR */ head_char_sect : OPEN DELIM TAG_CHAR mand_line_item - { if (open_conv_to_internal($4) == 0) YYERROR; + { /* Don't allow to continue if conversion context couldn't + be opened */ + if (open_conv_to_internal($4) == 0) HANDLE_ERROR; $$ = start_element(ELT_HEAD_CHAR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CHAR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(CHAR, $1, $$) } head_char_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_CHAR, PARENT, $5, NULL); + { end_element(ELT_HEAD_CHAR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -767,14 +844,14 @@ head_char_sub : head_char_vers_sect { OCCUR2(VERS, 0, 1) } head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_CHAR_VERS, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(VERS, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(VERS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_CHAR_VERS, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -782,26 +859,28 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item head_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_HEAD_LANG, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(LANG, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(LANG, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_LANG, PARENT, $5, NULL); + { end_element(ELT_HEAD_LANG, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.PLAC */ head_plac_sect : OPEN DELIM TAG_PLAC { $$ = start_element(ELT_HEAD_PLAC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(PLAC, $$) + GEDCOM_MAKE_NULL(val1)); + START(PLAC, $1, $$) } head_plac_subs { CHECK1(FORM) } CLOSE - { end_element(ELT_HEAD_PLAC, PARENT, $4, NULL); + { end_element(ELT_HEAD_PLAC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -815,14 +894,14 @@ head_plac_sub : head_plac_form_sect { OCCUR2(FORM, 1, 1) } head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_HEAD_PLAC_FORM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FORM, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_PLAC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -830,13 +909,17 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item head_note_sect : OPEN DELIM TAG_NOTE mand_line_item { $$ = start_element(ELT_HEAD_NOTE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NOTE, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(NOTE, $1, $$) } head_note_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_NOTE, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_HEAD_NOTE, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -859,13 +942,18 @@ trlr_sect : OPEN DELIM TAG_TRLR CLOSE { } /**** Family record ****/ /*********************************************************************/ fam_rec : OPEN DELIM POINTER DELIM TAG_FAM - { $$ = start_record(REC_FAM, - $1, GEDCOM_MAKE_STRING($3), $5); - START(FAM, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_FAM, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), + $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(FAM, $1, $$) } fam_subs { CHECK0 } CLOSE - { end_record(REC_FAM, $6); } + { end_record(REC_FAM, $6, GEDCOM_MAKE_NULL(val1)); } ; fam_subs : /* empty */ @@ -889,43 +977,55 @@ fam_sub : fam_event_struc_sub /* 0:M */ /* FAM.HUSB */ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer - { $$ = start_element(ELT_FAM_HUSB, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_HUSB, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(HUSB, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(HUSB, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_HUSB, PARENT, $5, NULL); + { end_element(ELT_FAM_HUSB, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* FAM.WIFE */ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer - { $$ = start_element(ELT_FAM_WIFE, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_WIFE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(WIFE, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(WIFE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_WIFE, PARENT, $5, NULL); + { end_element(ELT_FAM_WIFE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* FAM.CHIL */ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer - { $$ = start_element(ELT_FAM_CHIL, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_CHIL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CHIL, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(CHIL, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_CHIL, PARENT, $5, NULL); + { end_element(ELT_FAM_CHIL, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -933,27 +1033,32 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item { $$ = start_element(ELT_FAM_NCHI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NCHI, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NCHI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_NCHI, PARENT, $5, NULL); + { end_element(ELT_FAM_NCHI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* FAM.SUBM */ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_FAM_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SUBM, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SUBM, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_SUBM, PARENT, $5, NULL); + { end_element(ELT_FAM_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -961,13 +1066,20 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer /**** Individual record ****/ /*********************************************************************/ indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI - { $$ = start_record(REC_INDI, - $1, GEDCOM_MAKE_STRING($3), $5); - START(INDI, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_INDI, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(INDI, $1, $$) } indi_subs { CHECK0 } CLOSE - { end_record(REC_INDI, $6); } + { end_record(REC_INDI, $6, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_NO_SLGC_FAMC)) + compat_generate_slgc_famc_fam(); + } ; indi_subs : /* empty */ @@ -994,7 +1106,7 @@ indi_sub : indi_resn_sect { OCCUR2(RESN, 0, 1) } | indi_afn_sect /* 0:M */ | ident_struc_sub /* 0:1 */ | change_date_sub /* 0:1 */ - | ftree_addr_sect { if (!compat_mode(C_FTREE)) + | indi_addr_sect { if (!compat_mode(C_INDI_ADDR)) INVALID_TAG("ADDR"); } | no_std_sub @@ -1004,13 +1116,14 @@ indi_sub : indi_resn_sect { OCCUR2(RESN, 0, 1) } indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item { $$ = start_element(ELT_INDI_RESN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RESN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RESN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_RESN, PARENT, $5, NULL); + { end_element(ELT_INDI_RESN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1018,69 +1131,86 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item { $$ = start_element(ELT_INDI_SEX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SEX, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(SEX, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_SEX, PARENT, $5, NULL); + { end_element(ELT_INDI_SEX, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* INDI.SUBM */ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_INDI_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SUBM, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SUBM, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_SUBM, PARENT, $5, NULL); + { end_element(ELT_INDI_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* INDI.ALIA */ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer - { $$ = start_element(ELT_INDI_ALIA, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_ALIA, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ALIA, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(ALIA, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_ALIA, PARENT, $5, NULL); + { end_element(ELT_INDI_ALIA, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* INDI.ANCI */ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer - { $$ = start_element(ELT_INDI_ANCI, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_ANCI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ANCI, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(ANCI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_ANCI, PARENT, $5, NULL); + { end_element(ELT_INDI_ANCI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; /* INDI.DESI */ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer - { $$ = start_element(ELT_INDI_DESI, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_DESI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(DESI, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(DESI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_DESI, PARENT, $5, NULL); + { end_element(ELT_INDI_DESI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1088,13 +1218,14 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_INDI_RFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RFN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RFN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_RFN, PARENT, $5, NULL); + { end_element(ELT_INDI_RFN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1102,31 +1233,85 @@ indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item { $$ = start_element(ELT_INDI_AFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AFN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(AFN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_AFN, PARENT, $5, NULL); + { end_element(ELT_INDI_AFN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; -/* INDI.ADDR (Only for 'ftree' compatibility) */ -ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item - { START(ADDR, NULL) } no_std_subs { CHECK0 } CLOSE { } +/* INDI.ADDR (Only for compatibility) */ +indi_addr_sect : OPEN DELIM TAG_ADDR opt_line_item + { if (compat_mode(C_INDI_ADDR)) { + Gedcom_ctxt par = compat_generate_resi_start(PARENT); + START(RESI, $1, par); + $$ + = start_element(ELT_SUB_ADDR, + par, $1 + 1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val2, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(ADDR, $1 + 1, $$); + } + else { START(ADDR, $1, NULL) } + } + ftree_addr_subs + { CHECK0 } + CLOSE + { if (compat_mode(C_INDI_ADDR)) { + Gedcom_ctxt par = PARENT; + char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SUB_ADDR, par, $5, + GEDCOM_MAKE_STRING(val1, complete)); + CHECK0; + compat_generate_resi_end(PARENT, par); + } + } + ; + +ftree_addr_subs : /* empty */ + | ftree_addr_subs ftree_addr_sub + ; + +ftree_addr_sub : continuation_sub + | ftree_addr_phon_sect + | no_std_sub + ; + +ftree_addr_phon_sect : OPEN DELIM TAG_PHON mand_line_item + { $$ + = start_element(ELT_SUB_PHON, + GRANDPARENT(1), $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(PHON, $1, $$) + } + no_std_subs + { CHECK0 } + CLOSE + { end_element(ELT_SUB_PHON, GRANDPARENT(1), + $5, GEDCOM_MAKE_NULL(val1)); + } + ; /*********************************************************************/ /**** Multimedia record ****/ /*********************************************************************/ multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE - { $$ = start_record(REC_OBJE, - $1, GEDCOM_MAKE_STRING($3), $5); - START(OBJE, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_OBJE, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(OBJE, $1, $$) } obje_subs { CHECK2(FORM, BLOB) } CLOSE - { end_record(REC_OBJE, $6); } + { end_record(REC_OBJE, $6, GEDCOM_MAKE_NULL(val1)); } ; obje_subs : /* empty */ @@ -1147,13 +1332,14 @@ obje_sub : obje_form_sect { OCCUR2(FORM, 1, 1) } obje_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_OBJE_FORM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FORM, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_FORM, PARENT, $5, NULL); + { end_element(ELT_OBJE_FORM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1161,13 +1347,14 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_OBJE_TITL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TITL, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TITL, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_TITL, PARENT, $5, NULL); + { end_element(ELT_OBJE_TITL, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1175,13 +1362,16 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item obje_blob_sect : OPEN DELIM TAG_BLOB { $$ = start_element(ELT_OBJE_BLOB, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(BLOB, $$) + GEDCOM_MAKE_NULL(val1)); + reset_buffer(&concat_buffer); + START(BLOB, $1, $$) } obje_blob_subs { CHECK1(CONT) } CLOSE - { end_element(ELT_OBJE_BLOB, PARENT, $4, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_OBJE_BLOB, PARENT, $4, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1196,28 +1386,33 @@ obje_blob_sub : obje_blob_cont_sect { OCCUR1(CONT, 1) } obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_OBJE_BLOB_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CONT, $$) + GEDCOM_MAKE_STRING(val1, $4)); + safe_buf_append(&concat_buffer, $4); + START(CONT, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_OBJE_BLOB_CONT, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; /* OBJE.OBJE */ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer - { $$ = start_element(ELT_OBJE_OBJE, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_OBJE_OBJE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(OBJE, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(OBJE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_OBJE, PARENT, $5, NULL); + { end_element(ELT_OBJE_OBJE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1225,19 +1420,30 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer /**** Note record ****/ /*********************************************************************/ note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item - { $$ = start_record(REC_NOTE, - $1, GEDCOM_MAKE_STRING($3), $5); - START(NOTE, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_NOTE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_NOTE, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + $6, GEDCOM_MAKE_STRING(val2, $6)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $6); + START(NOTE, $1, $$) } note_subs { CHECK0 } CLOSE - { end_record(REC_NOTE, $6); } + { char* complete = get_buf_string(&concat_buffer); + end_record(REC_NOTE, $7, + GEDCOM_MAKE_STRING(val1, complete)); } ; note_line_item : /* empty */ - { if (!compat_mode(C_FTREE)) { + { if (!compat_mode(C_NOTE_NO_VALUE)) { gedcom_error(_("Missing value")); YYERROR; } + else { + $$ = VALUE_IF_MISSING; + } } | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); @@ -1252,20 +1458,47 @@ note_sub : continuation_sub /* 0:M */ | source_cit_sub /* 0:M */ | ident_struc_sub /* 0:1 */ | change_date_sub /* 0:1 */ + | note_note_sect { if (!compat_mode(C_NOTE_NOTE)) + INVALID_TAG("NOTE"); + } | no_std_sub ; +/* Same actions as cont_sect, for compatibility */ +note_note_sect : OPEN DELIM TAG_NOTE opt_line_item + { $3.string = "CONT"; + $3.value = TAG_CONT; + $$ = start_element(ELT_SUB_CONT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); + if (GEDCOM_IS_STRING(&val1)) + safe_buf_append(&concat_buffer, $4); + START(CONT, $1, $$) + } + no_std_subs + { CHECK0 } + CLOSE + { end_element(ELT_SUB_CONT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); + } + ; + /*********************************************************************/ /**** Repository record ****/ /*********************************************************************/ repos_rec : OPEN DELIM POINTER DELIM TAG_REPO - { $$ = start_record(REC_REPO, - $1, GEDCOM_MAKE_STRING($3), $5); - START(REPO, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_REPO); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_REPO, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(REPO, $1, $$) } repo_subs { CHECK0 } CLOSE - { end_record(REC_REPO, $6); } + { end_record(REC_REPO, $6, GEDCOM_MAKE_NULL(val1)); } ; repo_subs : /* empty */ @@ -1284,13 +1517,14 @@ repo_sub : repo_name_sect { OCCUR2(NAME, 0, 1) } repo_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_REPO_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NAME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NAME, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_REPO_NAME, PARENT, $5, NULL); + { end_element(ELT_REPO_NAME, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1298,13 +1532,17 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item /**** Source record ****/ /*********************************************************************/ source_rec : OPEN DELIM POINTER DELIM TAG_SOUR - { $$ = start_record(REC_SOUR, - $1, GEDCOM_MAKE_STRING($3), $5); - START(SOUR, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SOUR); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SOUR, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(SOUR, $1, $$) } sour_subs { CHECK0 } CLOSE - { end_record(REC_SOUR, $6); } + { end_record(REC_SOUR, $6, GEDCOM_MAKE_NULL(val1)); } ; sour_subs : /* empty */ @@ -1317,6 +1555,24 @@ sour_sub : sour_data_sect { OCCUR2(DATA, 0, 1) } | sour_abbr_sect { OCCUR2(ABBR, 0, 1) } | sour_publ_sect { OCCUR2(PUBL, 0, 1) } | sour_text_sect { OCCUR2(TEXT, 0, 1) } + | sour_type_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("TYPE"); + OCCUR2(TYPE, 0, 1) } + | sour_file_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("FILE"); + OCCUR2(FILE, 0, 1) } + | sour_plac_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("PLAC"); + OCCUR2(PLAC, 0, 1) } + | sour_date_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("DATE"); + OCCUR2(DATE, 0, 1) } + | sour_medi_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("MEDI"); + OCCUR2(MEDI, 0, 1) } + | sour_page_sect { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("PAGE"); + OCCUR2(PAGE, 0, 1) } | source_repos_cit_sub /* 0:1 */ | multim_link_sub /* 0:M */ | note_struc_sub /* 0:M */ @@ -1329,13 +1585,14 @@ sour_sub : sour_data_sect { OCCUR2(DATA, 0, 1) } sour_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SOUR_DATA, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(DATA, $$) + GEDCOM_MAKE_NULL(val1)); + START(DATA, $1, $$) } sour_data_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_DATA, PARENT, $4, NULL); + { end_element(ELT_SOUR_DATA, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1352,14 +1609,14 @@ sour_data_sub : sour_data_even_sect /* 0:M */ sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item { $$ = start_element(ELT_SOUR_DATA_EVEN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(EVEN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(EVEN, $1, $$) } sour_data_even_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1374,44 +1631,46 @@ sour_data_even_sub : sour_data_even_date_sect { OCCUR2(DATE, 0, 1) } sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SOUR_DATA_EVEN_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + $$ + = start_element(ELT_SOUR_DATA_EVEN_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item - { $$ = start_element(ELT_SOUR_DATA_EVEN_PLAC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PLAC, $$) + { $$ + = start_element(ELT_SOUR_DATA_EVEN_PLAC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item { $$ = start_element(ELT_SOUR_DATA_AGNC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AGNC, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(AGNC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_AGNC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1419,13 +1678,17 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item { $$ = start_element(ELT_SOUR_AUTH, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AUTH, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(AUTH, $1, $$) } sour_auth_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_AUTH, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SOUR_AUTH, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1441,13 +1704,17 @@ sour_auth_sub : continuation_sub /* 0:M */ sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_SOUR_TITL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TITL, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(TITL, $1, $$) } sour_titl_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_TITL, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SOUR_TITL, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1463,13 +1730,14 @@ sour_titl_sub : continuation_sub /* 0:M */ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item { $$ = start_element(ELT_SOUR_ABBR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ABBR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(ABBR, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_ABBR, PARENT, $5, NULL); + { end_element(ELT_SOUR_ABBR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1477,13 +1745,17 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item { $$ = start_element(ELT_SOUR_PUBL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PUBL, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(PUBL, $1, $$) } sour_publ_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_PUBL, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SOUR_PUBL, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1499,13 +1771,17 @@ sour_publ_sub : continuation_sub /* 0:M */ sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item { $$ = start_element(ELT_SOUR_TEXT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TEXT, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(TEXT, $1, $$) } sour_text_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_TEXT, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SOUR_TEXT, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1517,17 +1793,105 @@ sour_text_sub : continuation_sub /* 0:M */ | no_std_sub ; +/* Only for compatibility */ +sour_type_sect : OPEN DELIM TAG_TYPE opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +/* Only for compatibility */ +sour_file_sect : OPEN DELIM TAG_FILE opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +/* Only for compatibility */ +sour_plac_sect : OPEN DELIM TAG_PLAC opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +/* Only for compatibility */ +sour_date_sect : OPEN DELIM TAG_DATE opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +/* Only for compatibility */ +sour_medi_sect : OPEN DELIM TAG_MEDI opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +/* Only for compatibility */ +sour_page_sect : OPEN DELIM TAG_PAGE opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + /*********************************************************************/ /**** Submission record ****/ /*********************************************************************/ submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN - { $$ = start_record(REC_SUBN, - $1, GEDCOM_MAKE_STRING($3), $5); - START(SUBN, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SUBN); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SUBN, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(SUBN, $1, $$) } subn_subs { CHECK0 } CLOSE - { end_record(REC_SUBN, $6); } + { end_record(REC_SUBN, $6, GEDCOM_MAKE_NULL(val1)); } ; subn_subs : /* empty */ @@ -1546,15 +1910,19 @@ subn_sub : subn_subm_sect { OCCUR2(SUBM, 0, 1) } /* SUBN.SUBM */ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_SUBN_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUBN_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SUBM, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SUBM, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_SUBM, PARENT, $5, NULL); + { end_element(ELT_SUBN_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1562,13 +1930,14 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item { $$ = start_element(ELT_SUBN_FAMF, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMF, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(FAMF, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_FAMF, PARENT, $5, NULL); + { end_element(ELT_SUBN_FAMF, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1576,13 +1945,14 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUBN_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TEMP, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TEMP, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_TEMP, PARENT, $5, NULL); + { end_element(ELT_SUBN_TEMP, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1590,13 +1960,14 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item { $$ = start_element(ELT_SUBN_ANCE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ANCE, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(ANCE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_ANCE, PARENT, $5, NULL); + { end_element(ELT_SUBN_ANCE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1604,13 +1975,14 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item { $$ = start_element(ELT_SUBN_DESC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(DESC, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(DESC, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_DESC, PARENT, $5, NULL); + { end_element(ELT_SUBN_DESC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1618,13 +1990,14 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item { $$ = start_element(ELT_SUBN_ORDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ORDI, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(ORDI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_ORDI, PARENT, $5, NULL); + { end_element(ELT_SUBN_ORDI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1632,13 +2005,14 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBN_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RIN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RIN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_RIN, PARENT, $5, NULL); + { end_element(ELT_SUBN_RIN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1646,26 +2020,36 @@ subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item /**** Submitter record ****/ /*********************************************************************/ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM - { $$ = start_record(REC_SUBM, - $1, GEDCOM_MAKE_STRING($3), $5); - START(SUBM, $$) } + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SUBM, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); + START(SUBM, $1, $$) } subm_subs { CHECK1(NAME) } CLOSE - { end_record(REC_SUBM, $6); } + { end_record(REC_SUBM, $6, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_SUBM_CTRY)) + compat_free_ctry_parent_context(); + } ; subm_subs : /* empty */ | subm_subs subm_sub ; -subm_sub : subm_name_sect { OCCUR2(NAME, 0, 1) } +subm_sub : subm_name_sect { OCCUR2(NAME, 1, 1) } | addr_struc_sub /* 0:1 */ | multim_link_sub /* 0:M */ | subm_lang_sect { OCCUR2(LANG, 0, 3) } | subm_rfn_sect { OCCUR2(RFN, 0, 1) } | subm_rin_sect { OCCUR2(RIN, 0, 1) } | change_date_sub /* 0:1 */ + | subm_ctry_sect { if (!compat_mode(C_SUBM_CTRY)) + INVALID_TAG("CTRY"); + OCCUR2(CTRY, 0, 1) } | no_std_sub ; @@ -1673,13 +2057,14 @@ subm_sub : subm_name_sect { OCCUR2(NAME, 0, 1) } subm_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUBM_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NAME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NAME, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_NAME, PARENT, $5, NULL); + { end_element(ELT_SUBM_NAME, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1687,13 +2072,14 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_SUBM_LANG, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(LANG, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(LANG, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_LANG, PARENT, $5, NULL); + { end_element(ELT_SUBM_LANG, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1701,13 +2087,14 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_SUBM_RFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RFN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RFN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_RFN, PARENT, $5, NULL); + { end_element(ELT_SUBM_RFN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1715,16 +2102,30 @@ subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBM_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RIN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RIN, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_RIN, PARENT, $5, NULL); + { end_element(ELT_SUBM_RIN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; +/* SUBM.CTRY (Only for compatibility) */ +subm_ctry_sect : OPEN DELIM TAG_CTRY opt_line_item + { if (compat_mode(C_SUBM_CTRY)) { + $$ = compat_generate_addr_ctry_start($1, $3, $4); + } + } + CLOSE + { if (compat_mode (C_SUBM_CTRY)) { + compat_generate_addr_ctry_end($5); + } + } + ; + /*********************************************************************/ /**** Substructures ****/ /*********************************************************************/ @@ -1737,13 +2138,19 @@ addr_struc_sub : addr_sect { OCCUR2(ADDR, 0, 1) } addr_sect : OPEN DELIM TAG_ADDR mand_line_item { $$ = start_element(ELT_SUB_ADDR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ADDR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(ADDR, $1, $$); + if (compat_mode(C_SUBM_CTRY)) + compat_save_ctry_parent_context($$); } addr_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SUB_ADDR, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -1764,98 +2171,108 @@ addr_sub : addr_cont_sect /* 0:M */ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_ADDR_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CONT, $$) + GEDCOM_MAKE_STRING(val1, $4)); + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); + safe_buf_append(&concat_buffer, $4); + START(CONT, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_CONT, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_CONT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item { $$ = start_element(ELT_SUB_ADDR_ADR1, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ADR1, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(ADR1, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_ADR1, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_ADR1, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item { $$ = start_element(ELT_SUB_ADDR_ADR2, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ADR2, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(ADR2, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_ADR2, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_ADR2, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_city_sect : OPEN DELIM TAG_CITY mand_line_item { $$ = start_element(ELT_SUB_ADDR_CITY, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CITY, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(CITY, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_CITY, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_CITY, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item { $$ = start_element(ELT_SUB_ADDR_STAE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(STAE, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(STAE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_STAE, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_STAE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_post_sect : OPEN DELIM TAG_POST mand_line_item { $$ = start_element(ELT_SUB_ADDR_POST, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(POST, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(POST, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_POST, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_POST, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item { $$ = start_element(ELT_SUB_ADDR_CTRY, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CTRY, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(CTRY, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ADDR_CTRY, PARENT, $5, NULL); + { end_element(ELT_SUB_ADDR_CTRY, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; phon_sect : OPEN DELIM TAG_PHON mand_line_item { $$ = start_element(ELT_SUB_PHON, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PHON, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(PHON, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_PHON, PARENT, $5, NULL); + { end_element(ELT_SUB_PHON, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1864,15 +2281,19 @@ assoc_struc_sub : asso_sect /* 0:M */ ; asso_sect : OPEN DELIM TAG_ASSO mand_pointer - { $$ = start_element(ELT_SUB_ASSO, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_ANY); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUB_ASSO, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ASSO, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(ASSO, $1, $$) } asso_subs { CHECK2(TYPE,RELA) } CLOSE - { end_element(ELT_SUB_ASSO, PARENT, $5, NULL); + { end_element(ELT_SUB_ASSO, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1887,26 +2308,28 @@ asso_subs : /* empty */ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item { $$ = start_element(ELT_SUB_ASSO_TYPE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TYPE, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TYPE, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ASSO_TYPE, PARENT, $5, NULL); + { end_element(ELT_SUB_ASSO_TYPE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item { $$ = start_element(ELT_SUB_ASSO_RELA, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RELA, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RELA, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_ASSO_RELA, PARENT, $5, NULL); + { end_element(ELT_SUB_ASSO_RELA, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1917,13 +2340,14 @@ change_date_sub : change_date_chan_sect { OCCUR2(CHAN, 0, 1) } change_date_chan_sect : OPEN DELIM TAG_CHAN { $$ = start_element(ELT_SUB_CHAN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(CHAN, $$) + GEDCOM_MAKE_NULL(val1)); + START(CHAN, $1, $$) } change_date_chan_subs { CHECK1(DATE) } CLOSE - { end_element(ELT_SUB_CHAN, PARENT, $4, NULL); + { end_element(ELT_SUB_CHAN, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1940,13 +2364,13 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_CHAN_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) } + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } change_date_date_subs { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -1962,14 +2386,14 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { $$ = start_element(ELT_SUB_CHAN_TIME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TIME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TIME, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_TIME, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -1978,15 +2402,19 @@ chi_fam_link_sub : famc_sect /* 0:M */ ; famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_FAMC, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUB_FAMC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMC, $$) + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(FAMC, $1, $$) } famc_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_FAMC, PARENT, $5, NULL); + { end_element(ELT_SUB_FAMC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2002,13 +2430,14 @@ famc_sub : famc_pedi_sect /* 0:M */ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item { $$ = start_element(ELT_SUB_FAMC_PEDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PEDI, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(PEDI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_FAMC_PEDI, PARENT, $5, NULL); + { end_element(ELT_SUB_FAMC_PEDI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2017,32 +2446,68 @@ continuation_sub : cont_sect /* 0:M */ | conc_sect /* 0:M */ ; -cont_sect : OPEN DELIM TAG_CONT mand_line_item +cont_sect : OPEN DELIM TAG_CONT opt_line_item { $$ = start_element(ELT_SUB_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CONT, $$) + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); + if (GEDCOM_IS_STRING(&val1)) + safe_buf_append(&concat_buffer, $4); + START(CONT, $1, $$) } - no_std_subs + cont_conc_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_CONT, PARENT, $5, NULL); + { end_element(ELT_SUB_CONT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; conc_sect : OPEN DELIM TAG_CONC mand_line_item { $$ = start_element(ELT_SUB_CONC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CONC, $$) + GEDCOM_MAKE_STRING(val1, $4)); + if (compat_mode(C_CONC_NEEDS_SPACE)) { + safe_buf_append(&concat_buffer, " "); + } + safe_buf_append(&concat_buffer, $4); + START(CONC, $1, $$) } - no_std_subs + cont_conc_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_CONC, PARENT, $5, NULL); + { end_element(ELT_SUB_CONC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; +cont_conc_subs : /* empty */ + | cont_conc_subs cont_conc_sub + ; + +cont_conc_sub : cont_conc_sour_sect { if (!compat_mode(C_NOTE_CONC_SOUR)) + INVALID_TAG("SOUR"); + OCCUR2(SOUR, 0, 1) } + | no_std_sub + ; + +/* Only for compatibility */ +cont_conc_sour_sect : OPEN DELIM TAG_SOUR DELIM POINTER + { if (compat_mode(C_NOTE_CONC_SOUR)) { + $$ + = compat_generate_note_sour_start(GRANDPARENT(1), + $1, $3, $5); + if ($$ == (void*)-1) HANDLE_ERROR; + } + } + no_std_subs + CLOSE + { if (compat_mode(C_NOTE_CONC_SOUR)) { + compat_generate_note_sour_end($6); + } + } + ; + /* EVENT DETAIL */ event_detail_sub : event_detail_type_sect { OCCUR2(TYPE, 0, 1) } | event_detail_date_sect { OCCUR2(DATE, 0, 1) } @@ -2057,69 +2522,75 @@ event_detail_sub : event_detail_type_sect { OCCUR2(TYPE, 0, 1) } ; event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item - { $$ = start_element(ELT_SUB_EVT_TYPE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TYPE, $$) + { $$ + = start_element(ELT_SUB_EVT_TYPE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(TYPE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_TYPE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SUB_EVT_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + $$ + = start_element(ELT_SUB_EVT_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item - { $$ = start_element(ELT_SUB_EVT_AGE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AGE, $$) + { struct age_value age = gedcom_parse_age($4); + $$ + = start_element(ELT_SUB_EVT_AGE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_AGE(val1, age)); + START(AGE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_AGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item - { $$ = start_element(ELT_SUB_EVT_AGNC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AGNC, $$) + { $$ + = start_element(ELT_SUB_EVT_AGNC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(AGNC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_AGNC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item - { $$ = start_element(ELT_SUB_EVT_CAUS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CAUS, $$) + { $$ + = start_element(ELT_SUB_EVT_CAUS, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(CAUS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_CAUS, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2129,30 +2600,30 @@ fam_event_struc_sub : fam_event_sect ; fam_event_sect : OPEN DELIM fam_event_tag opt_value - { - $$ = start_element(ELT_SUB_FAM_EVT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_FAM_EVT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($1, $$); } fam_event_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_FAM_EVT, PARENT, $5, NULL); + { end_element(ELT_SUB_FAM_EVT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; -fam_event_tag : TAG_ANUL { $$ = $1; START(ANUL, NULL) } - | TAG_CENS { $$ = $1; START(CENS, NULL) } - | TAG_DIV { $$ = $1; START(DIV, NULL) } - | TAG_DIVF { $$ = $1; START(DIVF, NULL) } - | TAG_ENGA { $$ = $1; START(ENGA, NULL) } - | TAG_MARR { $$ = $1; START(MARR, NULL) } - | TAG_MARB { $$ = $1; START(MARB, NULL) } - | TAG_MARC { $$ = $1; START(MARC, NULL) } - | TAG_MARL { $$ = $1; START(MARL, NULL) } - | TAG_MARS { $$ = $1; START(MARS, NULL) } +fam_event_tag : TAG_ANUL { $$ = $1; START1(ANUL) } + | TAG_CENS { $$ = $1; START1(CENS) } + | TAG_DIV { $$ = $1; START1(DIV) } + | TAG_DIVF { $$ = $1; START1(DIVF) } + | TAG_ENGA { $$ = $1; START1(ENGA) } + | TAG_MARR { $$ = $1; START1(MARR) } + | TAG_MARB { $$ = $1; START1(MARB) } + | TAG_MARC { $$ = $1; START1(MARC) } + | TAG_MARL { $$ = $1; START1(MARL) } + | TAG_MARS { $$ = $1; START1(MARS) } ; fam_event_subs : /* empty */ @@ -2168,14 +2639,14 @@ fam_event_sub : event_detail_sub fam_even_husb_sect : OPEN DELIM TAG_HUSB { $$ = start_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(HUSB, $$) + GEDCOM_MAKE_NULL(val1)); + START(HUSB, $1, $$) } fam_even_husb_subs { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2188,44 +2659,45 @@ fam_even_husb_sub : fam_even_age_sect { OCCUR2(AGE, 1, 1) } ; fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item - { $$ = start_element(ELT_SUB_FAM_EVT_AGE, + { struct age_value age = gedcom_parse_age($4); + $$ = start_element(ELT_SUB_FAM_EVT_AGE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(AGE, $$) + GEDCOM_MAKE_AGE(val1, age)); + START(AGE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_FAM_EVT_AGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; fam_even_wife_sect : OPEN DELIM TAG_WIFE { $$ = start_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(WIFE, $$) + GEDCOM_MAKE_NULL(val1)); + START(WIFE, $1, $$) } fam_even_husb_subs { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; fam_gen_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(EVEN, $$) + GEDCOM_MAKE_NULL(val1)); + START(EVEN, $1, $$) } fam_gen_even_subs { CHECK0 } CLOSE { end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2247,14 +2719,14 @@ ident_struc_sub : ident_refn_sect /* 0:M */ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item { $$ = start_element(ELT_SUB_IDENT_REFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(REFN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(REFN, $1, $$) } ident_refn_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2267,30 +2739,31 @@ ident_refn_sub : ident_refn_type_sect { OCCUR2(TYPE, 0, 1) } ; ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item - { $$ = start_element(ELT_SUB_IDENT_REFN_TYPE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TYPE, $$) + { $$ + = start_element(ELT_SUB_IDENT_REFN_TYPE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(TYPE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUB_IDENT_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(RIN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(RIN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_RIN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2302,39 +2775,42 @@ indiv_attr_struc_sub : indiv_attr_sect /* 0:M */ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item { $$ = start_element(ELT_SUB_INDIV_ATTR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + GEDCOM_MAKE_STRING(val1, $4)); + START2($1, $$); } indiv_attr_event_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_ATTR, PARENT, $5, NULL); + { end_element(ELT_SUB_INDIV_ATTR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } + ; -indiv_attr_tag : TAG_CAST { $$ = $1; START(CAST, NULL) } - | TAG_DSCR { $$ = $1; START(DSCR, NULL) } - | TAG_EDUC { $$ = $1; START(EDUC, NULL) } - | TAG_IDNO { $$ = $1; START(IDNO, NULL) } - | TAG_NATI { $$ = $1; START(NATI, NULL) } - | TAG_NCHI { $$ = $1; START(NCHI, NULL) } - | TAG_NMR { $$ = $1; START(NMR, NULL) } - | TAG_OCCU { $$ = $1; START(OCCU, NULL) } - | TAG_PROP { $$ = $1; START(PROP, NULL) } - | TAG_RELI { $$ = $1; START(RELI, NULL) } - | TAG_SSN { $$ = $1; START(SSN, NULL) } - | TAG_TITL { $$ = $1; START(TITL, NULL) } +indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) } + | TAG_DSCR { $$ = $1; START1(DSCR) } + | TAG_EDUC { $$ = $1; START1(EDUC) } + | TAG_IDNO { $$ = $1; START1(IDNO) } + | TAG_NATI { $$ = $1; START1(NATI) } + | TAG_NCHI { $$ = $1; START1(NCHI) } + | TAG_NMR { $$ = $1; START1(NMR) } + | TAG_OCCU { $$ = $1; START1(OCCU) } + | TAG_PROP { $$ = $1; START1(PROP) } + | TAG_RELI { $$ = $1; START1(RELI) } + | TAG_SSN { $$ = $1; START1(SSN) } + | TAG_TITL { $$ = $1; START1(TITL) } + ; indiv_resi_sect : OPEN DELIM TAG_RESI { $$ = start_element(ELT_SUB_INDIV_RESI, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(RESI, $$) + GEDCOM_MAKE_NULL(val1)); + START(RESI, $1, $$) } indiv_attr_event_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_RESI, PARENT, $4, NULL); + { end_element(ELT_SUB_INDIV_RESI, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2354,21 +2830,22 @@ indiv_even_struc_sub : indiv_birt_sect ; indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value - { $$ = start_element(ELT_SUB_INDIV_BIRT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_INDIV_BIRT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($1, $$); } indiv_birt_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_BIRT, PARENT, $5, NULL); + { end_element(ELT_SUB_INDIV_BIRT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; -indiv_birt_tag : TAG_BIRT { $$ = $1; START(BIRT, NULL) } - | TAG_CHR { $$ = $1; START(CHR, NULL) } +indiv_birt_tag : TAG_BIRT { $$ = $1; START1(BIRT) } + | TAG_CHR { $$ = $1; START1(CHR) } ; indiv_birt_subs : /* empty */ @@ -2381,52 +2858,58 @@ indiv_birt_sub : event_detail_sub ; indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_INDIV_BIRT_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMC, $$) + { struct xref_value *xr = gedcom_parse_xref($4, + XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_INDIV_BIRT_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(FAMC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value - { $$ = start_element(ELT_SUB_INDIV_GEN, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_INDIV_GEN, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($1, $$); } indiv_gen_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_GEN, PARENT, $5, NULL); + { end_element(ELT_SUB_INDIV_GEN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; -indiv_gen_tag : TAG_DEAT { $$ = $1; START(DEAT, NULL) } - | TAG_BURI { $$ = $1; START(BURI, NULL) } - | TAG_CREM { $$ = $1; START(CREM, NULL) } - | TAG_BAPM { $$ = $1; START(BAPM, NULL) } - | TAG_BARM { $$ = $1; START(BARM, NULL) } - | TAG_BASM { $$ = $1; START(BASM, NULL) } - | TAG_BLES { $$ = $1; START(BLES, NULL) } - | TAG_CHRA { $$ = $1; START(CHRA, NULL) } - | TAG_CONF { $$ = $1; START(CONF, NULL) } - | TAG_FCOM { $$ = $1; START(FCOM, NULL) } - | TAG_ORDN { $$ = $1; START(ORDN, NULL) } - | TAG_NATU { $$ = $1; START(NATU, NULL) } - | TAG_EMIG { $$ = $1; START(EMIG, NULL) } - | TAG_IMMI { $$ = $1; START(IMMI, NULL) } - | TAG_CENS { $$ = $1; START(CENS, NULL) } - | TAG_PROB { $$ = $1; START(PROB, NULL) } - | TAG_WILL { $$ = $1; START(WILL, NULL) } - | TAG_GRAD { $$ = $1; START(GRAD, NULL) } - | TAG_RETI { $$ = $1; START(RETI, NULL) } +indiv_gen_tag : TAG_DEAT { $$ = $1; START1(DEAT) } + | TAG_BURI { $$ = $1; START1(BURI) } + | TAG_CREM { $$ = $1; START1(CREM) } + | TAG_BAPM { $$ = $1; START1(BAPM) } + | TAG_BARM { $$ = $1; START1(BARM) } + | TAG_BASM { $$ = $1; START1(BASM) } + | TAG_BLES { $$ = $1; START1(BLES) } + | TAG_CHRA { $$ = $1; START1(CHRA) } + | TAG_CONF { $$ = $1; START1(CONF) } + | TAG_FCOM { $$ = $1; START1(FCOM) } + | TAG_ORDN { $$ = $1; START1(ORDN) } + | TAG_NATU { $$ = $1; START1(NATU) } + | TAG_EMIG { $$ = $1; START1(EMIG) } + | TAG_IMMI { $$ = $1; START1(IMMI) } + | TAG_CENS { $$ = $1; START1(CENS) } + | TAG_PROB { $$ = $1; START1(PROB) } + | TAG_WILL { $$ = $1; START1(WILL) } + | TAG_GRAD { $$ = $1; START1(GRAD) } + | TAG_RETI { $$ = $1; START1(RETI) } ; indiv_gen_subs : /* empty */ @@ -2438,14 +2921,16 @@ indiv_gen_sub : event_detail_sub ; indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value - { $$ = start_element(ELT_SUB_INDIV_ADOP, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - START(ADOP, $$) } + { $$ + = start_element(ELT_SUB_INDIV_ADOP, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START(ADOP, $1, $$) } indiv_adop_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_ADOP, PARENT, $5, NULL); + { end_element(ELT_SUB_INDIV_ADOP, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2459,15 +2944,20 @@ indiv_adop_sub : event_detail_sub ; indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_INDIV_ADOP_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMC, $$) } + { struct xref_value *xr = gedcom_parse_xref($4, + XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_INDIV_ADOP_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(FAMC, $1, $$) } indiv_adop_famc_subs { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2483,25 +2973,27 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item { $$ = start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ADOP, $$) } + GEDCOM_MAKE_STRING(val1, $4)); + START(ADOP, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; indiv_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_INDIV_EVEN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(EVEN, $$) } + GEDCOM_MAKE_NULL(val1)); + START(EVEN, $1, $$) } indiv_gen_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_INDIV_EVEN, PARENT, $4, NULL); + { end_element(ELT_SUB_INDIV_EVEN, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2513,20 +3005,20 @@ lds_indiv_ord_sub : lio_bapl_sect /* 0:M */ lio_bapl_sect : OPEN DELIM lio_bapl_tag { $$ = start_element(ELT_SUB_LIO_BAPL, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - /* set the parent context separately from START here */ - set_parentctxt($$); + GEDCOM_MAKE_NULL(val1)); + START2($1, $$); } lio_bapl_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_LIO_BAPL, PARENT, $4, NULL); + { end_element(ELT_SUB_LIO_BAPL, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; -lio_bapl_tag : TAG_BAPL { $$ = $1; START(BAPL, NULL) } - | TAG_CONL { $$ = $1; START(CONL, NULL) } - | TAG_ENDL { $$ = $1; START(ENDL, NULL) } +lio_bapl_tag : TAG_BAPL { $$ = $1; START1(BAPL) } + | TAG_CONL { $$ = $1; START1(CONL) } + | TAG_ENDL { $$ = $1; START1(ENDL) } ; lio_bapl_subs : /* empty */ @@ -2545,67 +3037,72 @@ lio_bapl_sub : lio_bapl_stat_sect { OCCUR2(STAT, 0, 1) } lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(STAT, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(STAT, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TEMP, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TEMP, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PLAC, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lio_slgc_sect : OPEN DELIM TAG_SLGC { $$ = start_element(ELT_SUB_LIO_SLGC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(SLGC, $$) + GEDCOM_MAKE_NULL(val1)); + START(SLGC, $1, $$) } lio_slgc_subs - { CHECK1(FAMC) } + { if (compat_mode(C_NO_SLGC_FAMC) && ! CHK_COND(FAMC)) + compat_generate_slgc_famc_link($4); + else CHK(FAMC); + CHECK0; + } CLOSE - { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, NULL); + { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2618,16 +3115,20 @@ lio_slgc_sub : lio_bapl_sub ; lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_LIO_SLGC_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMC, $$) + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_LIO_SLGC_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(FAMC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2638,12 +3139,13 @@ lds_spouse_seal_sub : lss_slgs_sect lss_slgs_sect : OPEN DELIM TAG_SLGS { $$ = start_element(ELT_SUB_LSS_SLGS, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(SLGS, $$) } + GEDCOM_MAKE_NULL(val1)); + START(SLGS, $1, $$) } lss_slgs_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, NULL); + { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2663,54 +3165,54 @@ lss_slgs_sub : lss_slgs_stat_sect { OCCUR2(STAT, 0, 1) } lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(STAT, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(STAT, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TEMP, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(TEMP, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PLAC, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2720,30 +3222,35 @@ multim_link_sub : multim_obje_link_sect ; multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER - { $$ = start_element(ELT_SUB_MULTIM_OBJE, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); - START(OBJE, $$) + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_MULTIM_OBJE, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(OBJE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $6, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; multim_obje_emb_sect : OPEN DELIM TAG_OBJE { $$ = start_element(ELT_SUB_MULTIM_OBJE, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(OBJE, $$) + GEDCOM_MAKE_NULL(val1)); + START(OBJE, $1, $$) } multim_obje_emb_subs { CHECK2(FORM,FILE) } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2759,42 +3266,48 @@ multim_obje_emb_sub : multim_obje_form_sect { OCCUR2(FORM, 1, 1) } ; multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_FORM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FORM, $$) + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_FORM, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE_FORM, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_TITL, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TITL, $$) + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_TITL, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(TITL, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE_TITL, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_FILE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FILE, $$) + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_FILE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(FILE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE_FILE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2804,15 +3317,21 @@ note_struc_sub : note_struc_link_sect /* 0:M */ ; note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER - { $$ = start_element(ELT_SUB_NOTE, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); - START(NOTE, $$) + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_NOTE); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_NOTE, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(NOTE, $1, $$) } note_struc_link_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_NOTE, PARENT, $6, NULL); + { end_element(ELT_SUB_NOTE, PARENT, $6, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2825,16 +3344,26 @@ note_struc_link_sub : source_cit_sub ; note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item - { $$ + { char* str = $4; + if (compat_mode(C_NOTE_TOO_LONG)) + str = compat_long_line_get_prefix($4); + $$ = start_element(ELT_SUB_NOTE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - START(NOTE, $$) + PARENT, $1, $3, str, + GEDCOM_MAKE_NULL_OR_STRING(val1, str)); + reset_buffer(&concat_buffer); + if ($4) + safe_buf_append(&concat_buffer, $4); + START(NOTE, $1, $$); + if (compat_mode(C_NOTE_TOO_LONG)) + compat_long_line_finish($$, $1); } note_struc_emb_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_NOTE, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SUB_NOTE, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -2854,13 +3383,14 @@ pers_name_struc_sub : pers_name_sect /* 0:M */ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NAME, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NAME, $1, $$) } pers_name_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_PERS_NAME, PARENT, $5, NULL); + { end_element(ELT_SUB_PERS_NAME, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2882,79 +3412,79 @@ pers_name_sub : pers_name_npfx_sect { OCCUR2(NPFX, 0, 1) } pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NPFX, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NPFX, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(GIVN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(GIVN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NICK, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NICK, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NICK, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_NICK, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SPFX, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(SPFX, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_SURN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SURN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(SURN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_SURN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(NSFX, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(NSFX, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2963,15 +3493,17 @@ place_struc_sub : place_struc_plac_sect /* 0:M */ ; place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item - { $$ = start_element(ELT_SUB_PLAC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PLAC, $$) + { $$ + = start_element(ELT_SUB_PLAC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(PLAC, $1, $$) } place_struc_plac_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_PLAC, PARENT, $5, NULL); + { end_element(ELT_SUB_PLAC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2986,16 +3518,17 @@ place_struc_plac_sub : place_plac_form_sect { OCCUR2(FORM, 0, 1) } ; place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item - { $$ = start_element(ELT_SUB_PLAC_FORM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FORM, $$) + { $$ + = start_element(ELT_SUB_PLAC_FORM, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PLAC_FORM, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3005,15 +3538,21 @@ source_cit_sub : source_cit_link_sect /* 0:M */ ; source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER - { $$ = start_element(ELT_SUB_SOUR, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); - START(SOUR, $$) + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_SOUR); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_SOUR, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(SOUR, $1, $$) } source_cit_link_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_SOUR, PARENT, $6, NULL); + { end_element(ELT_SUB_SOUR, PARENT, $6, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3031,30 +3570,32 @@ source_cit_link_sub : source_cit_page_sect { OCCUR2(PAGE, 0, 1) } ; source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item - { $$ = start_element(ELT_SUB_SOUR_PAGE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(PAGE, $$) + { $$ + = start_element(ELT_SUB_SOUR_PAGE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(PAGE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_PAGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item - { $$ = start_element(ELT_SUB_SOUR_EVEN, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(EVEN, $$) + { $$ + = start_element(ELT_SUB_SOUR_EVEN, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(EVEN, $1, $$) } source_cit_even_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3067,30 +3608,32 @@ source_cit_even_sub : source_cit_even_role_sect { OCCUR2(ROLE, 0, 1) } ; source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item - { $$ = start_element(ELT_SUB_SOUR_EVEN_ROLE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(ROLE, $$) + { $$ + = start_element(ELT_SUB_SOUR_EVEN_ROLE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(ROLE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN_ROLE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; source_cit_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SUB_SOUR_DATA, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - START(DATA, $$) + GEDCOM_MAKE_NULL(val1)); + START(DATA, $1, $$) } source_cit_data_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3105,30 +3648,36 @@ source_cit_data_sub : source_cit_data_date_sect { OCCUR2(DATE, 0, 1) } source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SUB_SOUR_DATA_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); - START(DATE, $$) + $$ + = start_element(ELT_SUB_SOUR_DATA_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA_DATE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item - { $$ = start_element(ELT_SUB_SOUR_TEXT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(TEXT, $$) + { $$ + = start_element(ELT_SUB_SOUR_TEXT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(TEXT, $1, $$) } source_cit_text_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_SOUR_TEXT, PARENT, $5, - NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SUB_SOUR_TEXT, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -3141,29 +3690,34 @@ source_cit_text_sub : continuation_sub ; source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item - { $$ = start_element(ELT_SUB_SOUR_QUAY, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(QUAY, $$) + { $$ + = start_element(ELT_SUB_SOUR_QUAY, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); + START(QUAY, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_QUAY, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item { $$ = start_element(ELT_SUB_SOUR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(SOUR, $$) + GEDCOM_MAKE_STRING(val1, $4)); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(SOUR, $1, $$) } source_cit_emb_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_SOUR, PARENT, $5, NULL); + { char* complete = get_buf_string(&concat_buffer); + end_element(ELT_SUB_SOUR, PARENT, $5, + GEDCOM_MAKE_STRING(val1, complete)); } ; @@ -3179,18 +3733,42 @@ source_cit_emb_sub : continuation_sub /* SOURCE REPOSITORY CITATION */ source_repos_cit_sub : source_repos_repo_sect { OCCUR2(REPO, 0, 1) } + | source_repos_repo_txt_sect + { if (!compat_mode(C_NONSTD_SOUR_TAGS)) + INVALID_TAG("REPO"); + OCCUR2(REPO, 0, 1) + } ; -source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer - { $$ = start_element(ELT_SUB_REPO, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(REPO, $$) - } +/* Only for compatibility */ +source_repos_repo_txt_sect : OPEN DELIM TAG_REPO opt_line_item + { if (compat_mode(C_NONSTD_SOUR_TAGS)) { + $$ = + compat_generate_nonstd_sour_start(PARENT, $1, $3, $4, + &usertag_buffer); + } + } + CLOSE + { if (compat_mode(C_NONSTD_SOUR_TAGS)) + compat_generate_nonstd_sour_end(PARENT, $5); + } + ; + +source_repos_repo_sect : OPEN DELIM TAG_REPO DELIM POINTER + { struct xref_value *xr + = gedcom_parse_xref($5, XREF_USED, XREF_REPO); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_REPO, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(REPO, $1, $$); + } source_repos_repo_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_REPO, PARENT, $5, NULL); + { end_element(ELT_SUB_REPO, PARENT, $6, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3206,13 +3784,14 @@ source_repos_repo_sub : note_struc_sub caln_sect : OPEN DELIM TAG_CALN mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(CALN, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(CALN, $1, $$) } caln_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_REPO_CALN, PARENT, $5, NULL); + { end_element(ELT_SUB_REPO_CALN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3227,13 +3806,14 @@ caln_sub : caln_medi_sect { OCCUR2(MEDI, 0, 1) } caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(MEDI, $$) + GEDCOM_MAKE_STRING(val1, $4)); + START(MEDI, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $5, NULL); + { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3242,15 +3822,20 @@ spou_fam_link_sub : spou_fam_fams_sect /* 0:M */ ; spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer - { $$ = start_element(ELT_SUB_FAMS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - START(FAMS, $$) + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_FAMS, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); + START(FAMS, $1, $$) } spou_fam_fams_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_FAMS, PARENT, $5, NULL); + { end_element(ELT_SUB_FAMS, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3272,64 +3857,108 @@ no_std_subs : /* empty */ no_std_sub : user_sect /* 0:M */ | gen_sect - | error error_subs CLOSE { HANDLE_ERROR } + | error error_subs + CLOSE { HANDLE_ERROR } ; no_std_rec : user_rec /* 0:M */ | gen_rec - | error error_subs CLOSE { HANDLE_ERROR } + | error error_subs + CLOSE { HANDLE_ERROR } ; -user_rec : OPEN DELIM opt_xref USERTAG +user_rec : OPEN DELIM opt_xref USERTAG { if ($4.string[0] != '_') { - gedcom_error(_("Undefined tag (and not a valid user tag): %s"), - $4); - YYERROR; + if ((compat_mode(C_551_TAGS) + && compat_check_551_tag($4.string, &usertag_buffer)) + || + (compat_mode(C_NONSTD_SOUR_TAGS) + && compat_check_sour_tag($4.string, &usertag_buffer))) { + $4.string = get_buf_string(&usertag_buffer); + } + else { + gedcom_error(_("Undefined tag (and not a valid user tag): %s"), + $4); + YYERROR; + } } } opt_value - { $$ = start_record(REC_USER, - $1, GEDCOM_MAKE_NULL_OR_STRING($3), $4); - START($4, $$) + { struct xref_value *xr = NULL; + if ($3 != NULL) { + xr = gedcom_parse_xref($3, XREF_DEFINED, XREF_USER); + if (xr == NULL) HANDLE_ERROR; + } + $$ = start_record(REC_USER, + $1, + GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr), + $4, $6, &val2); + START($4, $1, $$) } user_sects { CHECK0 } CLOSE - { end_record(REC_USER, $7); } + { end_record(REC_USER, $7, GEDCOM_MAKE_NULL(val1)); } ; -user_sect : OPEN DELIM opt_xref USERTAG +user_sect : OPEN DELIM opt_xref USERTAG { if ($4.string[0] != '_') { - gedcom_error(_("Undefined tag (and not a valid user tag): %s"), - $4); - YYERROR; + if ((compat_mode(C_551_TAGS) + && compat_check_551_tag($4.string, &usertag_buffer)) + || + (compat_mode(C_SUBM_COMM) + && compat_check_subm_comm($4.string, get_parenttag(0), + &usertag_buffer)) + || + (compat_mode(C_NONSTD_SOUR_TAGS) + && compat_check_sour_tag($4.string, &usertag_buffer))) { + $4.string = get_buf_string(&usertag_buffer); + } + else { + gedcom_error(_("Undefined tag (and not a valid user tag): %s"), + $4); + YYERROR; + } } } opt_value - { $$ = start_element(ELT_USER, PARENT, $1, $4, $6, - GEDCOM_MAKE_NULL_OR_STRING($6)); - START($4, $$); + { $$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2); + START($4, $1, $$); } user_sects { CHECK0 } CLOSE - { end_element(ELT_USER, PARENT, $7, NULL); + { end_element(ELT_USER, PARENT, $7, + GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_SUBM_COMM)) + compat_close_subm_comm(); } ; user_sects : /* empty */ { } | user_sects user_sect { } + | user_sects gen_sect + { if (compat_mode(C_SUBM_COMM)) { + } + else { + gedcom_error(_("Standard tag not allowed in user section")); + YYERROR; + } + } ; opt_xref : /* empty */ { $$ = NULL; } | POINTER DELIM { $$ = $1; } ; -opt_value : /* empty */ { $$ = NULL; } - | DELIM line_value { $$ = $2; } - ; - -line_value : POINTER { $$ = $1; } - | line_item { $$ = $1; } +opt_value : /* empty */ { GEDCOM_MAKE_NULL(val2); + $$ = NULL; } + | DELIM POINTER { struct xref_value *xr + = gedcom_parse_xref($2, XREF_USED, + XREF_USER); + GEDCOM_MAKE_XREF_PTR(val2, xr); + $$ = $2; } + | DELIM line_item { GEDCOM_MAKE_STRING(val2, $2); + $$ = $2; } ; mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; } @@ -3337,49 +3966,58 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; } $$ = $2; } ; -mand_line_item : /* empty */ { gedcom_error(_("Missing value")); YYERROR; } +mand_line_item : /* empty */ + { if (compat_mode(C_NO_REQUIRED_VALUES)) { + gedcom_debug_print("==Val: =="); + $$ = VALUE_IF_MISSING; + } + else { + gedcom_error(_("Missing value")); YYERROR; + } + } | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); $$ = $2; } ; -opt_line_item : /* empty */ { } - | DELIM line_item { } +opt_line_item : /* empty */ { $$ = NULL; } + | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); + $$ = $2; } ; line_item : anychar { size_t i; - CLEAR_BUFFER(line_item_buf); - line_item_buf_ptr = line_item_buf; - /* The following also takes care of '@@' */ + reset_buffer(&line_item_buffer); + /* The following also takes care of '@@' */ if (!strncmp($1, "@@", 3)) - *line_item_buf_ptr++ = '@'; + SAFE_BUF_ADDCHAR(&line_item_buffer, '@') else for (i=0; i < strlen($1); i++) - *line_item_buf_ptr++ = $1[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i]) + $$ = get_buf_string(&line_item_buffer); } | ESCAPE { size_t i; - CLEAR_BUFFER(line_item_buf); - line_item_buf_ptr = line_item_buf; - for (i=0; i < strlen($1); i++) - *line_item_buf_ptr++ = $1[i]; - $$ = line_item_buf; + reset_buffer(&line_item_buffer); + for (i=0; i < strlen($1); i++) + SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i]) + $$ = get_buf_string(&line_item_buffer); } | line_item anychar { size_t i; /* The following also takes care of '@@' */ if (!strncmp($2, "@@", 3)) - *line_item_buf_ptr++ = '@'; + SAFE_BUF_ADDCHAR(&line_item_buffer, '@') else for (i=0; i < strlen($2); i++) - *line_item_buf_ptr++ = $2[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i]) + $$ = get_buf_string(&line_item_buffer); } | line_item ESCAPE { size_t i; for (i=0; i < strlen($2); i++) - *line_item_buf_ptr++ = $2[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i]) + $$ = get_buf_string(&line_item_buffer); } + | line_item error anychar { HANDLE_ERROR; } + | line_item error ESCAPE { HANDLE_ERROR; } ; anychar : ANYCHAR { } @@ -3391,11 +4029,26 @@ error_subs : /* empty */ ; error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { } + ; gen_sect : OPEN DELIM opt_xref anystdtag - { INVALID_TAG($4); } - opt_value opt_sects CLOSE - { } + { if (compat_mode(C_SUBM_COMM) + && compat_check_subm_comm_cont($4.string)) { + /* Will pass here */ + } + else { + INVALID_TAG($4.string); + } + } + opt_value + { if (compat_mode(C_SUBM_COMM)) { + $$ = compat_subm_comm_cont_start(PARENT, $6); + } + } + opt_sects CLOSE + { if (compat_mode(C_SUBM_COMM)) + compat_subm_comm_cont_end(PARENT, $7); + } ; gen_rec : gen_rec_top @@ -3403,7 +4056,7 @@ gen_rec : gen_rec_top ; gen_rec_norm : OPEN DELIM opt_xref anystdtag - { INVALID_TOP_TAG($4) } + { INVALID_TOP_TAG($4.string) } opt_value opt_sects CLOSE { } ; @@ -3559,6 +4212,7 @@ anystdtag : TAG_ABBR | TAG_VERS { } | TAG_WIFE { } | TAG_WILL { } + ; %% @@ -3568,14 +4222,20 @@ int* count_arrays[MAXGEDCLEVEL+1]; char tag_stack[MAXGEDCLEVEL+1][MAXSTDTAGLEN+1]; Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1]; -void push_countarray() +void push_countarray(int level) { int *count = NULL; + gedcom_debug_print("Push Count level: %d, level: %d", count_level, level); + if (count_level != level + 1) { + gedcom_error(_("Internal error: count level mismatch")); + exit(1); + } if (count_level > MAXGEDCLEVEL) { gedcom_error(_("Internal error: count array overflow")); exit(1); } else { + gedcom_debug_print("calloc countarray %d", count_level); count = (int *)calloc(YYNTOKENS, sizeof(int)); if (count == NULL) { gedcom_error(_("Internal error: count array calloc error")); @@ -3587,24 +4247,24 @@ void push_countarray() } } -void set_parenttag(char* tag) +void set_parenttag(const char* tag) { - strncpy(tag_stack[count_level], tag, MAXSTDTAGLEN+1); + strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1); } void set_parentctxt(Gedcom_ctxt ctxt) { - ctxt_stack[count_level] = ctxt; + ctxt_stack[count_level+1] = ctxt; } -char* get_parenttag() +char* get_parenttag(int offset) { - return tag_stack[count_level]; + return tag_stack[count_level - offset]; } -Gedcom_ctxt get_parentctxt() +Gedcom_ctxt get_parentctxt(int offset) { - return ctxt_stack[count_level]; + return ctxt_stack[count_level - offset]; } int count_tag(int tag) @@ -3622,17 +4282,43 @@ int check_occurrence(int tag) void pop_countarray() { int *count; + gedcom_debug_print("Pop Count level: %d", count_level); if (count_level < 0) { gedcom_error(_("Internal error: count array underflow")); exit(1); } else { count = count_arrays[count_level]; + gedcom_debug_print("free countarray %d", count_level); free(count); count_arrays[count_level] = NULL; } } +void clean_up() +{ + gedcom_debug_print("Cleanup countarrays"); + while (count_level > 0) { + pop_countarray(); + --count_level; + } +} + +void cleanup_concat_buffer() +{ + cleanup_buffer(&concat_buffer); +} + +void cleanup_line_item_buffer() +{ + cleanup_buffer(&line_item_buffer); +} + +void cleanup_usertag_buffer() +{ + cleanup_buffer(&usertag_buffer); +} + /* Enabling debug mode */ /* level 0: no debugging */ /* level 1: only internal */ @@ -3655,7 +4341,7 @@ void gedcom_set_debug_level(int level, FILE* f) } } -int gedcom_debug_print(char* s, ...) +int gedcom_debug_print(const char* s, ...) { int res = 0; if (gedcom_high_level_debug) { @@ -3667,35 +4353,3 @@ int gedcom_debug_print(char* s, ...) } return(res); } - -/* Setting the error mechanism */ -void gedcom_set_error_handling(Gedcom_err_mech mechanism) -{ - error_mechanism = mechanism; -} - -/* Compatibility handling */ - -void gedcom_set_compat_handling(int enable_compat) -{ - compat_enabled = enable_compat; -} - -void set_compatibility(char* program) -{ - if (compat_enabled) { - if (! strncmp(program, "ftree", 6)) { - gedcom_warning(_("Enabling compatibility with 'ftree'")); - compatibility = C_FTREE; - } - else { - compatibility = 0; - } - } -} - -int compat_mode(int compat_flags) -{ - return (compat_flags & compatibility); -} -