X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=bd6ea1d3d922970796af5d9743cda8d69bcab726;hb=989bc1d7262c6e767de09804fb530a5ebea55a5d;hp=56f10c2297263ec70a8e6c885a7c0d9463d2dbb0;hpb=7da3fd2e7d76ca0a0e128bb4230233e1bcffae10;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index 56f10c2..bd6ea1d 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -149,6 +149,7 @@ #include "age.h" #include "xref.h" #include "compat.h" +#include "buffer.h" int count_level = 0; int fail = 0; @@ -156,10 +157,18 @@ int gedcom_high_level_debug = 0; Gedcom_err_mech error_mechanism = IMMED_FAIL; Gedcom_val_struct val1; Gedcom_val_struct val2; - -char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1]; -char *line_item_buf_ptr; +void cleanup_line_item_buffer(); +struct safe_buffer line_item_buffer = { NULL, 0, NULL, 0, + cleanup_line_item_buffer }; + +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(int level); void set_parenttag(const char* tag); @@ -169,16 +178,14 @@ Gedcom_ctxt get_parentctxt(int offset); void pop_countarray(); int count_tag(int tag); int check_occurrence(int tag); -void clean_up(); +void clean_up(); -#define CLEAR_BUFFER(BUF) \ - memset(BUF, 0, sizeof(BUF)); - #define HANDLE_ERROR \ { if (error_mechanism == IMMED_FAIL) { \ 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) { \ @@ -208,7 +215,9 @@ void clean_up(); #TAG, parenttag); \ HANDLE_ERROR; \ } \ - } + } +#define CHK_COND(TAG) \ + check_occurrence(TAG_##TAG) #define POP \ { pop_countarray(); \ --count_level; \ @@ -253,7 +262,7 @@ void clean_up(); } %token_table -%expect 308 +%expect 317 %token BADTOKEN %token OPEN @@ -413,9 +422,13 @@ void clean_up(); %% file : head_sect records trlr_sect - { if (fail == 1) YYABORT; } + { compat_close(); + if (fail == 1) YYABORT; + } | error - { clean_up(); } + { compat_close(); + clean_up(); + } ; records : /* empty */ @@ -442,22 +455,24 @@ head_sect : OPEN DELIM TAG_HEAD NULL, GEDCOM_MAKE_NULL(val2)); START(HEAD, $1, $$) } head_subs - { if (compat_mode(C_FTREE)) { - CHECK3(SOUR, GEDC, CHAR); - compat_generate_submitter_link($4); - } - else if (compat_mode(C_LIFELINES)) { - CHECK1(SOUR); + { 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 - CHECK4(SOUR, SUBM, GEDC, CHAR) + } + else CHK(CHAR); + + CHECK1(SOUR); } CLOSE - { end_record(REC_HEAD, $4); - if (compat_mode(C_FTREE | C_LIFELINES)) + { end_record(REC_HEAD, $4, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_NO_SUBMITTER)) compat_generate_submitter(); } ; @@ -469,7 +484,7 @@ 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_LIFELINES)) + | head_time_sect { if (!compat_mode(C_HEAD_TIME)) INVALID_TAG("TIME"); OCCUR2(TIME, 0, 1) } | head_subm_sect { OCCUR2(SUBM, 1, 1) } @@ -486,7 +501,7 @@ 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(val1, $4)); @@ -495,7 +510,9 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item 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 */ @@ -510,7 +527,8 @@ 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(val1, $4)); START(VERS, $1, $$) @@ -519,7 +537,7 @@ head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item { 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 @@ -532,7 +550,7 @@ head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item { 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 @@ -545,7 +563,7 @@ head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_CORP, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -567,7 +585,7 @@ head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -592,7 +610,8 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { 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 @@ -606,7 +625,8 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA_COPR, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -621,7 +641,7 @@ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_DEST, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -631,13 +651,15 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item $$ = start_element(ELT_HEAD_DATE, PARENT, $1, $3, $4, 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)); } ; @@ -659,14 +681,20 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_DATE_TIME, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; -/* HEAD.TIME (Only for 'Lifelines' compatibility) */ -/* Just ignore the time... */ -head_time_sect : OPEN DELIM TAG_TIME opt_line_item CLOSE - { gedcom_warning(_("Header change time lost in the compatibility")); +/* 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); + } } ; @@ -684,7 +712,7 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.SUBN */ @@ -701,7 +729,7 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBN, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.FILE */ @@ -714,7 +742,8 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item 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 */ @@ -727,7 +756,8 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item 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 */ @@ -738,9 +768,16 @@ head_gedc_sect : OPEN DELIM TAG_GEDC 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)); } ; @@ -762,7 +799,7 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item { 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 @@ -775,7 +812,7 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_GEDC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -792,7 +829,8 @@ head_char_sect : OPEN DELIM TAG_CHAR mand_line_item head_char_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_CHAR, PARENT, $5, NULL); + { end_element(ELT_HEAD_CHAR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -813,7 +851,7 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_CHAR_VERS, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -827,7 +865,8 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item 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 */ @@ -840,7 +879,8 @@ head_plac_sect : OPEN DELIM TAG_PLAC 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)); } ; @@ -861,7 +901,7 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item { CHECK0 } CLOSE { end_element(ELT_HEAD_PLAC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -870,12 +910,16 @@ head_note_sect : OPEN DELIM TAG_NOTE mand_line_item { $$ = start_element(ELT_HEAD_NOTE, PARENT, $1, $3, $4, 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)); } ; @@ -909,7 +953,7 @@ fam_rec : OPEN DELIM POINTER DELIM TAG_FAM fam_subs { CHECK0 } CLOSE - { end_record(REC_FAM, $6); } + { end_record(REC_FAM, $6, GEDCOM_MAKE_NULL(val1)); } ; fam_subs : /* empty */ @@ -944,7 +988,8 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_HUSB, PARENT, $5, NULL); + { end_element(ELT_FAM_HUSB, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -961,7 +1006,8 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_WIFE, PARENT, $5, NULL); + { end_element(ELT_FAM_WIFE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -978,7 +1024,8 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_CHIL, PARENT, $5, NULL); + { end_element(ELT_FAM_CHIL, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -992,7 +1039,8 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_NCHI, PARENT, $5, NULL); + { end_element(ELT_FAM_NCHI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1009,7 +1057,8 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_FAM_SUBM, PARENT, $5, NULL); + { end_element(ELT_FAM_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1027,7 +1076,10 @@ indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI 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 */ @@ -1054,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 @@ -1070,7 +1122,8 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_RESN, PARENT, $5, NULL); + { end_element(ELT_INDI_RESN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1084,7 +1137,8 @@ indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_SEX, PARENT, $5, NULL); + { end_element(ELT_INDI_SEX, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1101,7 +1155,8 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_SUBM, PARENT, $5, NULL); + { end_element(ELT_INDI_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1118,7 +1173,8 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_ALIA, PARENT, $5, NULL); + { end_element(ELT_INDI_ALIA, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1135,7 +1191,8 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_ANCI, PARENT, $5, NULL); + { end_element(ELT_INDI_ANCI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1152,7 +1209,8 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_DESI, PARENT, $5, NULL); + { end_element(ELT_INDI_DESI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1166,7 +1224,8 @@ indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_INDI_RFN, PARENT, $5, NULL); + { end_element(ELT_INDI_RFN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1180,29 +1239,34 @@ indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item 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 - { if (compat_mode(C_FTREE)) { +/* 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)); - START(ADDR, $1, $$); + 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_FTREE)) { + { if (compat_mode(C_INDI_ADDR)) { Gedcom_ctxt par = PARENT; - end_element(ELT_SUB_ADDR, par, $5, NULL); + 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); } @@ -1229,7 +1293,7 @@ ftree_addr_phon_sect : OPEN DELIM TAG_PHON mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_PHON, GRANDPARENT(1), - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1247,7 +1311,7 @@ multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE obje_subs { CHECK2(FORM, BLOB) } CLOSE - { end_record(REC_OBJE, $6); } + { end_record(REC_OBJE, $6, GEDCOM_MAKE_NULL(val1)); } ; obje_subs : /* empty */ @@ -1274,7 +1338,8 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_FORM, PARENT, $5, NULL); + { end_element(ELT_OBJE_FORM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1288,7 +1353,8 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_TITL, PARENT, $5, NULL); + { end_element(ELT_OBJE_TITL, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1297,12 +1363,15 @@ obje_blob_sect : OPEN DELIM TAG_BLOB { $$ = start_element(ELT_OBJE_BLOB, PARENT, $1, $3, NULL, 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)); } ; @@ -1318,13 +1387,14 @@ obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_OBJE_BLOB_CONT, PARENT, $1, $3, $4, 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)); } ; @@ -1341,7 +1411,8 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_OBJE_OBJE, PARENT, $5, NULL); + { end_element(ELT_OBJE_OBJE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1355,19 +1426,23 @@ note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item $$ = 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, $7); } + { 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 @@ -1383,9 +1458,32 @@ 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 ****/ /*********************************************************************/ @@ -1400,7 +1498,7 @@ repos_rec : OPEN DELIM POINTER DELIM TAG_REPO repo_subs { CHECK0 } CLOSE - { end_record(REC_REPO, $6); } + { end_record(REC_REPO, $6, GEDCOM_MAKE_NULL(val1)); } ; repo_subs : /* empty */ @@ -1425,7 +1523,8 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_REPO_NAME, PARENT, $5, NULL); + { end_element(ELT_REPO_NAME, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1443,7 +1542,7 @@ source_rec : OPEN DELIM POINTER DELIM TAG_SOUR sour_subs { CHECK0 } CLOSE - { end_record(REC_SOUR, $6); } + { end_record(REC_SOUR, $6, GEDCOM_MAKE_NULL(val1)); } ; sour_subs : /* empty */ @@ -1456,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 */ @@ -1474,7 +1591,8 @@ sour_data_sect : OPEN DELIM TAG_DATA sour_data_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_DATA, PARENT, $4, NULL); + { end_element(ELT_SOUR_DATA, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1498,7 +1616,7 @@ sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1523,7 +1641,7 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1538,7 +1656,7 @@ sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1552,7 +1670,7 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_AGNC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1561,12 +1679,16 @@ sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item { $$ = start_element(ELT_SOUR_AUTH, PARENT, $1, $3, $4, 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)); } ; @@ -1583,12 +1705,16 @@ sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_SOUR_TITL, PARENT, $1, $3, $4, 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)); } ; @@ -1610,7 +1736,8 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SOUR_ABBR, PARENT, $5, NULL); + { end_element(ELT_SOUR_ABBR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1619,12 +1746,16 @@ sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item { $$ = start_element(ELT_SOUR_PUBL, PARENT, $1, $3, $4, 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)); } ; @@ -1641,12 +1772,16 @@ sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item { $$ = start_element(ELT_SOUR_TEXT, PARENT, $1, $3, $4, 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)); } ; @@ -1658,6 +1793,90 @@ 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 ****/ /*********************************************************************/ @@ -1672,7 +1891,7 @@ submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN subn_subs { CHECK0 } CLOSE - { end_record(REC_SUBN, $6); } + { end_record(REC_SUBN, $6, GEDCOM_MAKE_NULL(val1)); } ; subn_subs : /* empty */ @@ -1702,7 +1921,8 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_SUBM, PARENT, $5, NULL); + { end_element(ELT_SUBN_SUBM, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1716,7 +1936,8 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_FAMF, PARENT, $5, NULL); + { end_element(ELT_SUBN_FAMF, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1730,7 +1951,8 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_TEMP, PARENT, $5, NULL); + { end_element(ELT_SUBN_TEMP, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1744,7 +1966,8 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_ANCE, PARENT, $5, NULL); + { end_element(ELT_SUBN_ANCE, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1758,7 +1981,8 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_DESC, PARENT, $5, NULL); + { end_element(ELT_SUBN_DESC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1772,7 +1996,8 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_ORDI, PARENT, $5, NULL); + { end_element(ELT_SUBN_ORDI, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1786,7 +2011,8 @@ subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBN_RIN, PARENT, $5, NULL); + { end_element(ELT_SUBN_RIN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1800,11 +2026,14 @@ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM $$ = start_record(REC_SUBM, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(SUBM, $1, $$) } + 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 */ @@ -1818,6 +2047,9 @@ subm_sub : subm_name_sect { OCCUR2(NAME, 1, 1) } | 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 ; @@ -1831,7 +2063,8 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_NAME, PARENT, $5, NULL); + { end_element(ELT_SUBM_NAME, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1845,7 +2078,8 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_LANG, PARENT, $5, NULL); + { end_element(ELT_SUBM_LANG, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1859,7 +2093,8 @@ subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUBM_RFN, PARENT, $5, NULL); + { end_element(ELT_SUBM_RFN, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -1873,10 +2108,24 @@ subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item 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 ****/ /*********************************************************************/ @@ -1890,12 +2139,18 @@ addr_sect : OPEN DELIM TAG_ADDR mand_line_item { $$ = start_element(ELT_SUB_ADDR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(ADDR, $1, $$) + 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)); } ; @@ -1917,12 +2172,15 @@ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_ADDR_CONT, PARENT, $1, $3, $4, 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 @@ -1934,7 +2192,8 @@ addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item 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 @@ -1946,7 +2205,8 @@ addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item 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 @@ -1958,7 +2218,8 @@ addr_city_sect : OPEN DELIM TAG_CITY mand_line_item 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 @@ -1970,7 +2231,8 @@ addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item 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 @@ -1982,7 +2244,8 @@ addr_post_sect : OPEN DELIM TAG_POST mand_line_item 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 @@ -1994,7 +2257,8 @@ addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item 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)); } ; @@ -2007,7 +2271,8 @@ phon_sect : OPEN DELIM TAG_PHON mand_line_item no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_PHON, PARENT, $5, NULL); + { end_element(ELT_SUB_PHON, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2027,7 +2292,8 @@ asso_sect : OPEN DELIM TAG_ASSO mand_pointer 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)); } ; @@ -2048,7 +2314,8 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item 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)); } ; @@ -2061,7 +2328,8 @@ asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item 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)); } ; @@ -2078,7 +2346,8 @@ change_date_chan_sect : OPEN DELIM TAG_CHAN 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)); } ; @@ -2101,7 +2370,7 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2124,7 +2393,7 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_TIME, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2144,7 +2413,8 @@ famc_sect : OPEN DELIM TAG_FAMC mand_pointer famc_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_FAMC, PARENT, $5, NULL); + { end_element(ELT_SUB_FAMC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2166,7 +2436,8 @@ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item 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)); } ; @@ -2175,16 +2446,20 @@ 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(val1, $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 + cont_conc_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_CONT, PARENT, $5, NULL); + { end_element(ELT_SUB_CONT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2192,15 +2467,47 @@ conc_sect : OPEN DELIM TAG_CONC mand_line_item { $$ = start_element(ELT_SUB_CONC, PARENT, $1, $3, $4, 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) } @@ -2225,7 +2532,7 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item { 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 @@ -2240,7 +2547,7 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item { 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 @@ -2255,7 +2562,7 @@ event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item { 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 @@ -2269,7 +2576,7 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item { 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 @@ -2283,7 +2590,7 @@ event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_CAUS, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2302,7 +2609,8 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value 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)); } ; @@ -2338,7 +2646,7 @@ fam_even_husb_sect : OPEN DELIM TAG_HUSB { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2361,7 +2669,7 @@ fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_FAM_EVT_AGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2375,7 +2683,7 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2389,7 +2697,7 @@ fam_gen_even_sect : OPEN DELIM TAG_EVEN { CHECK0 } CLOSE { end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2418,7 +2726,7 @@ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2441,7 +2749,7 @@ ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2455,7 +2763,7 @@ ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_RIN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2473,7 +2781,8 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item 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)); } ; @@ -2500,7 +2809,8 @@ indiv_resi_sect : OPEN DELIM TAG_RESI 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)); } ; @@ -2529,7 +2839,8 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value 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)); } ; @@ -2561,7 +2872,7 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2575,7 +2886,8 @@ indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value 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)); } ; @@ -2617,7 +2929,8 @@ indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value 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)); } ; @@ -2644,7 +2957,7 @@ indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2666,7 +2979,8 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2678,7 +2992,8 @@ indiv_even_sect : OPEN DELIM TAG_EVEN 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)); } ; @@ -2696,7 +3011,8 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag 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)); } ; @@ -2728,7 +3044,7 @@ lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item { 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 @@ -2742,7 +3058,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item { 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 @@ -2755,7 +3071,7 @@ lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { 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 @@ -2768,7 +3084,7 @@ lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2779,9 +3095,14 @@ lio_slgc_sect : OPEN DELIM TAG_SLGC 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)); } ; @@ -2807,7 +3128,7 @@ lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2823,7 +3144,8 @@ lss_slgs_sect : OPEN DELIM TAG_SLGS 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)); } ; @@ -2850,7 +3172,7 @@ lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item { 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 @@ -2864,7 +3186,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item { 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 @@ -2877,7 +3199,7 @@ lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { 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 @@ -2890,7 +3212,7 @@ lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2914,7 +3236,7 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $6, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2928,7 +3250,7 @@ multim_obje_emb_sect : OPEN DELIM TAG_OBJE { CHECK2(FORM,FILE) } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2954,7 +3276,8 @@ multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item { 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 @@ -2968,7 +3291,8 @@ multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item { 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 @@ -2982,7 +3306,8 @@ multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE_FILE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3000,12 +3325,13 @@ note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER = start_element(ELT_SUB_NOTE, PARENT, $1, $3, $5, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(NOTE, $1, $$) + 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)); } ; @@ -3018,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(val1, $4)); - START(NOTE, $1, $$) + 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)); } ; @@ -3053,7 +3389,8 @@ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item 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)); } ; @@ -3082,7 +3419,7 @@ pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item { 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 @@ -3095,7 +3432,7 @@ pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item { 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 @@ -3108,7 +3445,7 @@ pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item { 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 @@ -3121,7 +3458,7 @@ pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item { 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 @@ -3134,7 +3471,7 @@ pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item { 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 @@ -3147,7 +3484,7 @@ pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3165,7 +3502,8 @@ place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item 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)); } ; @@ -3190,7 +3528,7 @@ place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_PLAC_FORM, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3213,7 +3551,8 @@ source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER 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)); } ; @@ -3241,7 +3580,7 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_PAGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3256,7 +3595,7 @@ source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3279,7 +3618,8 @@ source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN_ROLE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3293,7 +3633,7 @@ source_cit_data_sect : OPEN DELIM TAG_DATA { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3318,7 +3658,8 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA_DATE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3327,13 +3668,16 @@ source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item = start_element(ELT_SUB_SOUR_TEXT, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TEXT, $1, $$) + 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)); } ; @@ -3356,7 +3700,7 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_QUAY, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3364,12 +3708,16 @@ source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item { $$ = start_element(ELT_SUB_SOUR, PARENT, $1, $3, $4, 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)); } ; @@ -3385,22 +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 +/* 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($4, XREF_USED, XREF_REPO); - if (xr == NULL) HANDLE_ERROR; + = gedcom_parse_xref($5, XREF_USED, XREF_REPO); + if (xr == NULL) HANDLE_ERROR; $$ = start_element(ELT_SUB_REPO, - PARENT, $1, $3, $4, + PARENT, $1, $3, $5, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(REPO, $1, $$) - } + 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)); } ; @@ -3422,7 +3790,8 @@ caln_sect : OPEN DELIM TAG_CALN mand_line_item 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)); } ; @@ -3443,7 +3812,8 @@ caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item 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)); } ; @@ -3464,7 +3834,8 @@ spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer 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)); } ; @@ -3498,9 +3869,18 @@ no_std_rec : user_rec /* 0:M */ 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 @@ -3518,13 +3898,26 @@ user_rec : OPEN DELIM opt_xref USERTAG 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 { 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 @@ -3534,12 +3927,23 @@ user_sect : OPEN DELIM opt_xref USERTAG 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; } @@ -3563,10 +3967,9 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; } ; mand_line_item : /* empty */ - { if (compat_mode(C_LIFELINES)) { - /* Lifelines tends to not care about mandatory values */ - gedcom_debug_print("==Val: =="); - $$ = ""; + { if (compat_mode(C_NO_REQUIRED_VALUES)) { + gedcom_debug_print("==Val: =="); + $$ = VALUE_IF_MISSING; } else { gedcom_error(_("Missing value")); YYERROR; @@ -3582,38 +3985,36 @@ opt_line_item : /* empty */ { $$ = NULL; } ; 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; } @@ -3631,9 +4032,23 @@ error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { } ; gen_sect : OPEN DELIM opt_xref anystdtag - { INVALID_TAG($4.string); } - 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 @@ -3810,7 +4225,7 @@ Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1]; void push_countarray(int level) { int *count = NULL; - gedcom_debug_print("Push Count level: %d, level: %d\n", count_level, level); + 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); @@ -3820,7 +4235,7 @@ void push_countarray(int level) exit(1); } else { - gedcom_debug_print("calloc countarray %d\n", count_level); + 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")); @@ -3867,14 +4282,14 @@ int check_occurrence(int tag) void pop_countarray() { int *count; - gedcom_debug_print("Pop Count level: %d\n", count_level); + 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\n", count_level); + gedcom_debug_print("free countarray %d", count_level); free(count); count_arrays[count_level] = NULL; } @@ -3882,13 +4297,28 @@ void pop_countarray() void clean_up() { - gedcom_debug_print("Cleanup countarrays\n"); + 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 */