X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=3e3667c4d410cbee1c5f2b5fc13bf37b8adcd53c;hb=a6ae7b8ee65f561b8ba9b189cf3e9504831621da;hp=ed3f3033e57cf049c137b40ba7d26f5bac9b337c;hpb=f0775fe0dbf452814ada20f660c796dc13c877d5;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index ed3f303..3e3667c 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -146,43 +146,39 @@ #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 val1; Gedcom_val_struct val2; - -char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1]; -char *line_item_buf_ptr; -enum _COMPAT { - C_FTREE = 0x01 -}; +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 }; + /* 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) { \ yyerrok; fail = 1; \ @@ -194,20 +190,22 @@ int compat_mode(int flags); #define START1(PARENTTAG) \ { set_parenttag(#PARENTTAG); \ } -#define START2(PARENTCTXT) \ +#define START2(LEVEL,PARENTCTXT) \ { set_parentctxt(PARENTCTXT); \ ++count_level; \ - push_countarray(); \ + push_countarray(LEVEL); \ } -#define START(PARENTTAG,PARENTCTXT) \ +#define START(PARENTTAG,LEVEL,PARENTCTXT) \ { START1(PARENTTAG); \ - START2(PARENTCTXT); \ + START2(LEVEL,PARENTCTXT); \ } #define PARENT \ - get_parentctxt() + 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; \ @@ -229,14 +227,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; \ @@ -257,7 +255,7 @@ int compat_mode(int flags); } %token_table -%expect 300 +%expect 308 %token BADTOKEN %token OPEN @@ -418,6 +416,8 @@ int compat_mode(int flags); file : head_sect records trlr_sect { if (fail == 1) YYABORT; } + | error + { clean_up(); } ; records : /* empty */ @@ -442,18 +442,26 @@ head_sect : OPEN DELIM TAG_HEAD { $$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1), $3, NULL, GEDCOM_MAKE_NULL(val2)); - START(HEAD, $$) } + START(HEAD, $1, $$) } head_subs - { if (compat_mode(C_FTREE)) { - CHECK3(SOUR, GEDC, CHAR); + { if (compat_mode(C_NO_SUBMITTER)) compat_generate_submitter_link($4); + else CHK(SUBM); + + if (compat_mode(C_NO_GEDC)) + compat_generate_gedcom($4); + else CHK(GEDC); + + if (compat_mode(C_NO_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)) + { end_record(REC_HEAD, $4, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_NO_SUBMITTER)) compat_generate_submitter(); } ; @@ -465,6 +473,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) } @@ -483,12 +494,13 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item $$ = start_element(ELT_HEAD_SOUR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(SOUR, $$) + START(SOUR, $1, $$) } head_sour_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_SOUR, PARENT, $5, NULL); } + { end_element(ELT_HEAD_SOUR, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; head_sour_subs : /* empty */ @@ -506,39 +518,39 @@ head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_SOUR_VERS, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(VERS, $$) + 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(val1, $4)); - START(NAME, $$) + 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(val1, $4)); - START(CORP, $$) + START(CORP, $1, $$) } head_sour_corp_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_CORP, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -554,13 +566,13 @@ head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item { $$ = start_element(ELT_HEAD_SOUR_DATA, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(DATA, $$) + START(DATA, $1, $$) } head_sour_data_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -579,13 +591,14 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item = start_element(ELT_HEAD_SOUR_DATA_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + 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 @@ -593,13 +606,14 @@ 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(val1, $4)); - START(COPR, $$) + START(COPR, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SOUR_DATA_COPR, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -608,13 +622,13 @@ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item { $$ = start_element(ELT_HEAD_DEST, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(DEST, $$) + START(DEST, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_DEST, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -624,13 +638,13 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item $$ = start_element(ELT_HEAD_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + START(DATE, $1, $$) } head_date_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_DATE, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -646,16 +660,23 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { $$ = start_element(ELT_HEAD_DATE_TIME, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TIME, $$) + 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 '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.SUBM */ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, @@ -664,13 +685,13 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer $$ = start_element(ELT_HEAD_SUBM, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SUBM, $$) + START(SUBM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.SUBN */ @@ -681,13 +702,13 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer $$ = start_element(ELT_HEAD_SUBN, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SUBN, $$) + START(SUBN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_SUBN, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; /* HEAD.FILE */ @@ -695,12 +716,13 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item { $$ = start_element(ELT_HEAD_FILE, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(FILE, $$) + 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 */ @@ -708,12 +730,13 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item { $$ = start_element(ELT_HEAD_COPR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(COPR, $$) + 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 */ @@ -721,12 +744,13 @@ head_gedc_sect : OPEN DELIM TAG_GEDC { $$ = start_element(ELT_HEAD_GEDC, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(GEDC, $$) + START(GEDC, $1, $$) } head_gedc_subs { CHECK2(VERS, FORM) } CLOSE - { end_element(ELT_HEAD_GEDC, PARENT, $4, NULL); + { end_element(ELT_HEAD_GEDC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -742,26 +766,26 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_GEDC_VERS, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(VERS, $$) + 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(val1, $4)); - START(FORM, $$) + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_GEDC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -769,16 +793,17 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item head_char_sect : OPEN DELIM TAG_CHAR mand_line_item { /* Don't allow to continue if conversion context couldn't be opened */ - if (open_conv_to_internal($4) == 0) YYABORT; + if (open_conv_to_internal($4) == 0) HANDLE_ERROR; $$ = start_element(ELT_HEAD_CHAR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(CHAR, $$) + 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)); } ; @@ -793,13 +818,13 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_CHAR_VERS, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(VERS, $$) + START(VERS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_CHAR_VERS, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -808,12 +833,13 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_HEAD_LANG, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(LANG, $$) + 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 */ @@ -821,12 +847,13 @@ head_plac_sect : OPEN DELIM TAG_PLAC { $$ = start_element(ELT_HEAD_PLAC, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(PLAC, $$) + 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)); } ; @@ -841,13 +868,13 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_HEAD_PLAC_FORM, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(FORM, $$) + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_HEAD_PLAC_FORM, - PARENT, $5, NULL); + PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -856,12 +883,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)); - START(NOTE, $$) + 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)); } ; @@ -891,11 +922,11 @@ fam_rec : OPEN DELIM POINTER DELIM TAG_FAM $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(FAM, $$) } + START(FAM, $1, $$) } fam_subs { CHECK0 } CLOSE - { end_record(REC_FAM, $6); } + { end_record(REC_FAM, $6, GEDCOM_MAKE_NULL(val1)); } ; fam_subs : /* empty */ @@ -925,12 +956,13 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer $$ = start_element(ELT_FAM_HUSB, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(HUSB, $$) + 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)); } ; @@ -942,12 +974,13 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer $$ = start_element(ELT_FAM_WIFE, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(WIFE, $$) + 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)); } ; @@ -959,12 +992,13 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer $$ = start_element(ELT_FAM_CHIL, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(CHIL, $$) + 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)); } ; @@ -973,12 +1007,13 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item { $$ = start_element(ELT_FAM_NCHI, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(NCHI, $$) + 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)); } ; @@ -990,12 +1025,13 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer $$ = start_element(ELT_FAM_SUBM, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SUBM, $$) + 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)); } ; @@ -1009,11 +1045,11 @@ indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI $$ = start_record(REC_INDI, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(INDI, $$) } + START(INDI, $1, $$) } indi_subs { CHECK0 } CLOSE - { end_record(REC_INDI, $6); } + { end_record(REC_INDI, $6, GEDCOM_MAKE_NULL(val1)); } ; indi_subs : /* empty */ @@ -1040,7 +1076,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 @@ -1051,12 +1087,13 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item { $$ = start_element(ELT_INDI_RESN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RESN, $$) + 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)); } ; @@ -1065,12 +1102,13 @@ indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item { $$ = start_element(ELT_INDI_SEX, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(SEX, $$) + 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)); } ; @@ -1082,12 +1120,13 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer $$ = start_element(ELT_INDI_SUBM, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SUBM, $$) + 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)); } ; @@ -1099,12 +1138,13 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer $$ = start_element(ELT_INDI_ALIA, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(ALIA, $$) + 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)); } ; @@ -1116,12 +1156,13 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer $$ = start_element(ELT_INDI_ANCI, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(ANCI, $$) + 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)); } ; @@ -1133,12 +1174,13 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer $$ = start_element(ELT_INDI_DESI, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(DESI, $$) + 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)); } ; @@ -1147,12 +1189,13 @@ indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_INDI_RFN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RFN, $$) + 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)); } ; @@ -1161,33 +1204,65 @@ indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item { $$ = start_element(ELT_INDI_AFN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(AFN, $$) + 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 - { Gedcom_ctxt par = compat_generate_resi_start(PARENT); - START(RESI, par); - $$ - = start_element(ELT_SUB_ADDR, - par, $1 + 1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING(val2, $4)); - START(ADDR, $$) +/* 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 + 1, $$); + } + else { START(ADDR, $1, NULL) } } - no_std_subs + ftree_addr_subs { CHECK0 } CLOSE - { Gedcom_ctxt par = PARENT; - end_element(ELT_SUB_ADDR, par, $5, NULL); - CHECK0; - compat_generate_resi_end(PARENT, par); + { if (compat_mode(C_INDI_ADDR)) { + Gedcom_ctxt par = PARENT; + end_element(ELT_SUB_ADDR, par, $5, + GEDCOM_MAKE_NULL(val1)); + 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 ****/ @@ -1199,11 +1274,11 @@ multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE $$ = start_record(REC_OBJE, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(OBJE, $$) } + 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 */ @@ -1225,12 +1300,13 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_OBJE_FORM, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(FORM, $$) + 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)); } ; @@ -1239,12 +1315,13 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_OBJE_TITL, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TITL, $$) + 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)); } ; @@ -1253,12 +1330,15 @@ obje_blob_sect : OPEN DELIM TAG_BLOB { $$ = start_element(ELT_OBJE_BLOB, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(BLOB, $$) + 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)); } ; @@ -1274,13 +1354,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)); - START(CONT, $$) + 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)); } ; @@ -1292,12 +1373,13 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer $$ = start_element(ELT_OBJE_OBJE, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(OBJE, $$) + 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)); } ; @@ -1311,15 +1393,19 @@ 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)); - START(NOTE, $$) } + 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 { @@ -1352,11 +1438,11 @@ repos_rec : OPEN DELIM POINTER DELIM TAG_REPO $$ = start_record(REC_REPO, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(REPO, $$) } + START(REPO, $1, $$) } repo_subs { CHECK0 } CLOSE - { end_record(REC_REPO, $6); } + { end_record(REC_REPO, $6, GEDCOM_MAKE_NULL(val1)); } ; repo_subs : /* empty */ @@ -1376,12 +1462,13 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_REPO_NAME, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(NAME, $$) + 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)); } ; @@ -1395,11 +1482,11 @@ source_rec : OPEN DELIM POINTER DELIM TAG_SOUR $$ = start_record(REC_SOUR, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(SOUR, $$) } + START(SOUR, $1, $$) } sour_subs { CHECK0 } CLOSE - { end_record(REC_SOUR, $6); } + { end_record(REC_SOUR, $6, GEDCOM_MAKE_NULL(val1)); } ; sour_subs : /* empty */ @@ -1425,12 +1512,13 @@ sour_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SOUR_DATA, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(DATA, $$) + 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)); } ; @@ -1448,13 +1536,13 @@ sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item { $$ = start_element(ELT_SOUR_DATA_EVEN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(EVEN, $$) + START(EVEN, $1, $$) } sour_data_even_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1473,13 +1561,13 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item = start_element(ELT_SOUR_DATA_EVEN_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1488,13 +1576,13 @@ 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(val1, $4)); - START(PLAC, $$) + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1502,13 +1590,13 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item { $$ = start_element(ELT_SOUR_DATA_AGNC, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(AGNC, $$) + START(AGNC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SOUR_DATA_AGNC, PARENT, - $5, NULL); + $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -1517,12 +1605,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)); - START(AUTH, $$) + 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)); } ; @@ -1539,12 +1631,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)); - START(TITL, $$) + 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)); } ; @@ -1561,12 +1657,13 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item { $$ = start_element(ELT_SOUR_ABBR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(ABBR, $$) + 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)); } ; @@ -1575,12 +1672,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)); - START(PUBL, $$) + 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)); } ; @@ -1597,12 +1698,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)); - START(TEXT, $$) + 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)); } ; @@ -1624,11 +1729,11 @@ submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN $$ = start_record(REC_SUBN, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(SUBN, $$) } + START(SUBN, $1, $$) } subn_subs { CHECK0 } CLOSE - { end_record(REC_SUBN, $6); } + { end_record(REC_SUBN, $6, GEDCOM_MAKE_NULL(val1)); } ; subn_subs : /* empty */ @@ -1653,12 +1758,13 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer $$ = start_element(ELT_SUBN_SUBM, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SUBM, $$) + 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)); } ; @@ -1667,12 +1773,13 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item { $$ = start_element(ELT_SUBN_FAMF, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(FAMF, $$) + 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)); } ; @@ -1681,12 +1788,13 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUBN_TEMP, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TEMP, $$) + 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)); } ; @@ -1695,12 +1803,13 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item { $$ = start_element(ELT_SUBN_ANCE, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(ANCE, $$) + 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)); } ; @@ -1709,12 +1818,13 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item { $$ = start_element(ELT_SUBN_DESC, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(DESC, $$) + 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)); } ; @@ -1723,12 +1833,13 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item { $$ = start_element(ELT_SUBN_ORDI, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(ORDI, $$) + 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)); } ; @@ -1737,12 +1848,13 @@ subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBN_RIN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RIN, $$) + 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)); } ; @@ -1756,11 +1868,11 @@ 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, $$) } + START(SUBM, $1, $$) } subm_subs { CHECK1(NAME) } CLOSE - { end_record(REC_SUBM, $6); } + { end_record(REC_SUBM, $6, GEDCOM_MAKE_NULL(val1)); } ; subm_subs : /* empty */ @@ -1782,12 +1894,13 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUBM_NAME, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(NAME, $$) + 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)); } ; @@ -1796,12 +1909,13 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_SUBM_LANG, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(LANG, $$) + 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)); } ; @@ -1810,12 +1924,13 @@ subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_SUBM_RFN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RFN, $$) + 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)); } ; @@ -1824,12 +1939,13 @@ subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBM_RIN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RIN, $$) + 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)); } ; @@ -1846,12 +1962,16 @@ 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, $$) + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(ADDR, $1, $$) } 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)); } ; @@ -1873,84 +1993,93 @@ 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)); - START(CONT, $$) + 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(val1, $4)); - START(ADR1, $$) + 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(val1, $4)); - START(ADR2, $$) + 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(val1, $4)); - START(CITY, $$) + 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(val1, $4)); - START(STAE, $$) + 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(val1, $4)); - START(POST, $$) + 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(val1, $4)); - START(CTRY, $$) + 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)); } ; @@ -1958,12 +2087,13 @@ phon_sect : OPEN DELIM TAG_PHON mand_line_item { $$ = start_element(ELT_SUB_PHON, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(PHON, $$) + 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)); } ; @@ -1973,17 +2103,18 @@ assoc_struc_sub : asso_sect /* 0:M */ asso_sect : OPEN DELIM TAG_ASSO mand_pointer { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, - XREF_INDI); + XREF_ANY); if (xr == NULL) HANDLE_ERROR; $$ = start_element(ELT_SUB_ASSO, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(ASSO, $$) + 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)); } ; @@ -1999,12 +2130,13 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item { $$ = start_element(ELT_SUB_ASSO_TYPE, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TYPE, $$) + 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)); } ; @@ -2012,12 +2144,13 @@ asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item { $$ = start_element(ELT_SUB_ASSO_RELA, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RELA, $$) + 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)); } ; @@ -2029,12 +2162,13 @@ change_date_chan_sect : OPEN DELIM TAG_CHAN { $$ = start_element(ELT_SUB_CHAN, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(CHAN, $$) + 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)); } ; @@ -2052,12 +2186,12 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item $$ = start_element(ELT_SUB_CHAN_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) } + START(DATE, $1, $$) } change_date_date_subs { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_DATE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2074,13 +2208,13 @@ 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(val1, $4)); - START(TIME, $$) + START(TIME, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_CHAN_TIME, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2095,12 +2229,13 @@ famc_sect : OPEN DELIM TAG_FAMC mand_pointer $$ = start_element(ELT_SUB_FAMC, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(FAMC, $$) + 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)); } ; @@ -2117,12 +2252,13 @@ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item { $$ = start_element(ELT_SUB_FAMC_PEDI, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(PEDI, $$) + 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)); } ; @@ -2135,12 +2271,15 @@ cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_CONT, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(CONT, $$) + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); + safe_buf_append(&concat_buffer, $4); + START(CONT, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_CONT, PARENT, $5, NULL); + { end_element(ELT_SUB_CONT, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2148,12 +2287,14 @@ conc_sect : OPEN DELIM TAG_CONC mand_line_item { $$ = start_element(ELT_SUB_CONC, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(CONC, $$) + safe_buf_append(&concat_buffer, $4); + START(CONC, $1, $$) } no_std_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_CONC, PARENT, $5, NULL); + { end_element(ELT_SUB_CONC, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2175,13 +2316,13 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item = start_element(ELT_SUB_EVT_TYPE, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(TYPE, $$) + 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 @@ -2190,27 +2331,28 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item = start_element(ELT_SUB_EVT_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + 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 - { $$ + { struct age_value age = gedcom_parse_age($4); + $$ = start_element(ELT_SUB_EVT_AGE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING(val1, $4)); - START(AGE, $$) + 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 @@ -2218,13 +2360,13 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item = start_element(ELT_SUB_EVT_AGNC, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(AGNC, $$) + 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 @@ -2232,13 +2374,13 @@ event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item = start_element(ELT_SUB_EVT_CAUS, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(CAUS, $$) + START(CAUS, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_EVT_CAUS, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2252,12 +2394,13 @@ 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(val1, $4)); - START2($$); + 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)); } ; @@ -2287,13 +2430,13 @@ fam_even_husb_sect : OPEN DELIM TAG_HUSB { $$ = start_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(HUSB, $$) + START(HUSB, $1, $$) } fam_even_husb_subs { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2306,16 +2449,17 @@ 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(val1, $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)); } ; @@ -2323,13 +2467,13 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE { $$ = start_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(WIFE, $$) + START(WIFE, $1, $$) } fam_even_husb_subs { CHECK1(AGE) } CLOSE { end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2337,13 +2481,13 @@ fam_gen_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(EVEN, $$) + START(EVEN, $1, $$) } fam_gen_even_subs { CHECK0 } CLOSE { end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2366,13 +2510,13 @@ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item { $$ = start_element(ELT_SUB_IDENT_REFN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(REFN, $$) + START(REFN, $1, $$) } ident_refn_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2389,13 +2533,13 @@ 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(val1, $4)); - START(TYPE, $$) + START(TYPE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2403,13 +2547,13 @@ ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUB_IDENT_RIN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(RIN, $$) + START(RIN, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_IDENT_RIN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2422,13 +2566,15 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item { $$ = start_element(ELT_SUB_INDIV_ATTR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START2($$); + 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; START1(CAST) } | TAG_DSCR { $$ = $1; START1(DSCR) } @@ -2442,17 +2588,19 @@ indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) } | 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(val1)); - START(RESI, $$) + 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)); } ; @@ -2476,12 +2624,13 @@ 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(val1, $4)); - START2($$); + 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)); } ; @@ -2507,13 +2656,13 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer = start_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(FAMC, $$) + START(FAMC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2522,12 +2671,13 @@ 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(val1, $4)); - START2($$); + 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)); } ; @@ -2565,11 +2715,12 @@ indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value = start_element(ELT_SUB_INDIV_ADOP, PARENT, $1, $3, $4, GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); - START(ADOP, $$) } + 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)); } ; @@ -2591,12 +2742,12 @@ indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer = start_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(FAMC, $$) } + START(FAMC, $1, $$) } indiv_adop_famc_subs { CHECK0 } CLOSE { end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2613,12 +2764,13 @@ 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(val1, $4)); - START(ADOP, $$) } + 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)); } ; @@ -2626,11 +2778,12 @@ indiv_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_INDIV_EVEN, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(EVEN, $$) } + 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)); } ; @@ -2643,12 +2796,13 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag { $$ = start_element(ELT_SUB_LIO_BAPL, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START2($$); + 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)); } ; @@ -2674,13 +2828,13 @@ 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(val1, $4)); - START(STAT, $$) + 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 @@ -2688,39 +2842,39 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item $$ = start_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + 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(val1, $4)); - START(TEMP, $$) + 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(val1, $4)); - START(PLAC, $$) + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2728,12 +2882,13 @@ lio_slgc_sect : OPEN DELIM TAG_SLGC { $$ = start_element(ELT_SUB_LIO_SLGC, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(SLGC, $$) + START(SLGC, $1, $$) } lio_slgc_subs { CHECK1(FAMC) } CLOSE - { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, NULL); + { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2753,13 +2908,13 @@ lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer = start_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(FAMC, $$) + START(FAMC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2771,11 +2926,12 @@ lss_slgs_sect : OPEN DELIM TAG_SLGS { $$ = start_element(ELT_SUB_LSS_SLGS, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(SLGS, $$) } + 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)); } ; @@ -2796,13 +2952,13 @@ 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(val1, $4)); - START(STAT, $$) + 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 @@ -2810,39 +2966,39 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item $$ = start_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + 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(val1, $4)); - START(TEMP, $$) + 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(val1, $4)); - START(PLAC, $$) + START(PLAC, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2860,13 +3016,13 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER = start_element(ELT_SUB_MULTIM_OBJE, PARENT, $1, $3, $5, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(OBJE, $$) + START(OBJE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $6, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2874,13 +3030,13 @@ multim_obje_emb_sect : OPEN DELIM TAG_OBJE { $$ = start_element(ELT_SUB_MULTIM_OBJE, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(OBJE, $$) + START(OBJE, $1, $$) } multim_obje_emb_subs { CHECK2(FORM,FILE) } CLOSE { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -2900,13 +3056,14 @@ 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(val1, $4)); - START(FORM, $$) + 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 @@ -2914,13 +3071,14 @@ 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(val1, $4)); - START(TITL, $$) + 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 @@ -2928,13 +3086,14 @@ 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(val1, $4)); - START(FILE, $$) + START(FILE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_MULTIM_OBJE_FILE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -2952,12 +3111,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, $$) + 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)); } ; @@ -2974,12 +3134,17 @@ note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item = start_element(ELT_SUB_NOTE, PARENT, $1, $3, $4, GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); - START(NOTE, $$) + reset_buffer(&concat_buffer); + if ($4) + safe_buf_append(&concat_buffer, $4); + START(NOTE, $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)); } ; @@ -3000,12 +3165,13 @@ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(NAME, $$) + 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)); } ; @@ -3028,78 +3194,78 @@ 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(val1, $4)); - START(NPFX, $$) + 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(val1, $4)); - START(GIVN, $$) + 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(val1, $4)); - START(NICK, $$) + 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(val1, $4)); - START(SPFX, $$) + 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(val1, $4)); - START(SURN, $$) + 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(val1, $4)); - START(NSFX, $$) + START(NSFX, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3112,12 +3278,13 @@ place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item = start_element(ELT_SUB_PLAC, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(PLAC, $$) + 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)); } ; @@ -3136,13 +3303,13 @@ place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item = start_element(ELT_SUB_PLAC_FORM, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(FORM, $$) + START(FORM, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_PLAC_FORM, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3160,12 +3327,13 @@ source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER = start_element(ELT_SUB_SOUR, PARENT, $1, $3, $5, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(SOUR, $$) + 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)); } ; @@ -3187,13 +3355,13 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item = start_element(ELT_SUB_SOUR_PAGE, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(PAGE, $$) + START(PAGE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_PAGE, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3202,13 +3370,13 @@ source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item = start_element(ELT_SUB_SOUR_EVEN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(EVEN, $$) + START(EVEN, $1, $$) } source_cit_even_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3225,13 +3393,14 @@ 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(val1, $4)); - START(ROLE, $$) + START(ROLE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_EVEN_ROLE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3239,13 +3408,13 @@ source_cit_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SUB_SOUR_DATA, PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); - START(DATA, $$) + START(DATA, $1, $$) } source_cit_data_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA, PARENT, $4, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3264,13 +3433,14 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item = start_element(ELT_SUB_SOUR_DATA_DATE, PARENT, $1, $3, $4, GEDCOM_MAKE_DATE(val1, dv)); - START(DATE, $$) + START(DATE, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_DATA_DATE, - PARENT, $5, NULL); + PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3279,13 +3449,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, $$) + 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)); } ; @@ -3302,13 +3475,13 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item = start_element(ELT_SUB_SOUR_QUAY, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(QUAY, $$) + START(QUAY, $1, $$) } no_std_subs { CHECK0 } CLOSE { end_element(ELT_SUB_SOUR_QUAY, PARENT, $5, - NULL); + GEDCOM_MAKE_NULL(val1)); } ; @@ -3316,12 +3489,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)); - START(SOUR, $$) + 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)); } ; @@ -3347,12 +3524,13 @@ source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer = start_element(ELT_SUB_REPO, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(REPO, $$) + START(REPO, $1, $$) } source_repos_repo_subs { CHECK0 } CLOSE - { end_element(ELT_SUB_REPO, PARENT, $5, NULL); + { end_element(ELT_SUB_REPO, PARENT, $5, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3369,12 +3547,13 @@ caln_sect : OPEN DELIM TAG_CALN mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(CALN, $$) + 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)); } ; @@ -3390,12 +3569,13 @@ caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - START(MEDI, $$) + 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)); } ; @@ -3411,12 +3591,13 @@ spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer = start_element(ELT_SUB_FAMS, PARENT, $1, $3, $4, GEDCOM_MAKE_XREF_PTR(val1, xr)); - START(FAMS, $$) + 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)); } ; @@ -3438,12 +3619,14 @@ 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 @@ -3463,12 +3646,12 @@ user_rec : OPEN DELIM opt_xref USERTAG $1, GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr), $4, $6, &val2); - START($4, $$) + 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 { if ($4.string[0] != '_') { @@ -3479,12 +3662,13 @@ user_sect : OPEN DELIM opt_xref USERTAG } opt_value { $$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2); - START($4, $$); + START($4, $1, $$); } user_sects { CHECK0 } CLOSE - { end_element(ELT_USER, PARENT, $7, NULL); + { end_element(ELT_USER, PARENT, $7, + GEDCOM_MAKE_NULL(val1)); } ; @@ -3512,7 +3696,16 @@ 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)) { + /* Lifelines tends to not care about mandatory values */ + gedcom_debug_print("==Val: =="); + $$ = ""; + } + else { + gedcom_error(_("Missing value")); YYERROR; + } + } | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); $$ = $2; } ; @@ -3523,39 +3716,39 @@ 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; } ; anychar : ANYCHAR { } @@ -3567,6 +3760,7 @@ 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.string); } @@ -3735,6 +3929,7 @@ anystdtag : TAG_ABBR | TAG_VERS { } | TAG_WIFE { } | TAG_WILL { } + ; %% @@ -3744,14 +3939,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\n", 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\n", count_level); count = (int *)calloc(YYNTOKENS, sizeof(int)); if (count == NULL) { gedcom_error(_("Internal error: count array calloc error")); @@ -3763,7 +3964,7 @@ void push_countarray() } } -void set_parenttag(char* tag) +void set_parenttag(const char* tag) { strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1); } @@ -3773,14 +3974,14 @@ void set_parentctxt(Gedcom_ctxt 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) @@ -3798,17 +3999,38 @@ int check_occurrence(int tag) void pop_countarray() { int *count; + gedcom_debug_print("Pop Count level: %d\n", 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); free(count); count_arrays[count_level] = NULL; } } +void clean_up() +{ + gedcom_debug_print("Cleanup countarrays\n"); + 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); +} + /* Enabling debug mode */ /* level 0: no debugging */ /* level 1: only internal */ @@ -3831,7 +4053,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) { @@ -3849,29 +4071,3 @@ 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); -} -