X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=911b5fdf85b0a049002b59bc80de634792efe2f1;hb=bd6f144d30a06cb896a0c9544e4af5f42848bae7;hp=4fcd0cf087d58c82e2e5c517bd20a6fd231ea89c;hpb=706c9bfcdfc8d16c3a65243d708af135c2e7c894;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index 4fcd0cf..911b5fd 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -1,5 +1,5 @@ /* Parser for Gedcom. - Copyright (C) 2001 The Genes Development Team + Copyright (C) 2001, 2002 The Genes Development Team This file is part of the Gedcom parser library. Contributed by Peter Verthez , 2001. @@ -146,6 +146,8 @@ #include "encoding.h" #include "interface.h" #include "date.h" +#include "xref.h" +#include "compat.h" int count_level = 0; int fail = 0; @@ -153,21 +155,23 @@ int compat_enabled = 1; int gedcom_high_level_debug = 0; int compatibility = 0; Gedcom_err_mech error_mechanism = IMMED_FAIL; -Gedcom_val_struct val; +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 + C_FTREE = 0x01, + C_LIFELINES = 0x02 }; /* These are defined at the bottom of the file */ void push_countarray(); void set_parenttag(char* tag); -char* get_parenttag(); +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); @@ -188,22 +192,30 @@ int compat_mode(int flags); yyerrok; \ } \ } -#define START(PARENTTAG,PARENTCTXT) \ - { ++count_level; \ - set_parenttag(#PARENTTAG); \ - set_parentctxt(PARENTCTXT); \ +#define START1(PARENTTAG) \ + { set_parenttag(#PARENTTAG); \ + } +#define START2(PARENTCTXT) \ + { set_parentctxt(PARENTCTXT); \ + ++count_level; \ push_countarray(); \ } -#define PARENT \ - get_parentctxt() +#define START(PARENTTAG,PARENTCTXT) \ + { START1(PARENTTAG); \ + START2(PARENTCTXT); \ + } +#define PARENT \ + get_parentctxt(0) +#define GRANDPARENT(OFF) \ + get_parentctxt(OFF) #define CHK(TAG) \ { if (!check_occurrence(TAG_##TAG)) { \ - char* parenttag = get_parenttag(); \ + char* parenttag = get_parenttag(0); \ gedcom_error(_("The tag '%s' is mandatory within '%s', but missing"),\ #TAG, parenttag); \ HANDLE_ERROR; \ } \ - } + } #define POP \ { pop_countarray(); \ --count_level; \ @@ -220,14 +232,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; \ @@ -243,11 +255,12 @@ int compat_mode(int flags); %union { int number; char *string; + struct tag_struct tag; Gedcom_ctxt ctxt; } %token_table -%expect 300 +%expect 304 %token BADTOKEN %token OPEN @@ -256,141 +269,145 @@ int compat_mode(int flags); %token DELIM %token ANYCHAR %token POINTER -%token USERTAG -%token TAG_ABBR -%token TAG_ADDR -%token TAG_ADR1 -%token TAG_ADR2 -%token TAG_ADOP -%token TAG_AFN -%token TAG_AGE -%token TAG_AGNC -%token TAG_ALIA -%token TAG_ANCE -%token TAG_ANCI -%token TAG_ANUL -%token TAG_ASSO -%token TAG_AUTH -%token TAG_BAPL -%token TAG_BAPM -%token TAG_BARM -%token TAG_BASM -%token TAG_BIRT -%token TAG_BLES -%token TAG_BLOB -%token TAG_BURI -%token TAG_CALN -%token TAG_CAST -%token TAG_CAUS -%token TAG_CENS -%token TAG_CHAN -%token TAG_CHAR -%token TAG_CHIL -%token TAG_CHR -%token TAG_CHRA -%token TAG_CITY -%token TAG_CONC -%token TAG_CONF -%token TAG_CONL -%token TAG_CONT -%token TAG_COPR -%token TAG_CORP -%token TAG_CREM -%token TAG_CTRY -%token TAG_DATA -%token TAG_DATE -%token TAG_DEAT -%token TAG_DESC -%token TAG_DESI -%token TAG_DEST -%token TAG_DIV -%token TAG_DIVF -%token TAG_DSCR -%token TAG_EDUC -%token TAG_EMIG -%token TAG_ENDL -%token TAG_ENGA -%token TAG_EVEN -%token TAG_FAM -%token TAG_FAMC -%token TAG_FAMF -%token TAG_FAMS -%token TAG_FCOM -%token TAG_FILE -%token TAG_FORM -%token TAG_GEDC -%token TAG_GIVN -%token TAG_GRAD -%token TAG_HEAD -%token TAG_HUSB -%token TAG_IDNO -%token TAG_IMMI -%token TAG_INDI -%token TAG_LANG -%token TAG_LEGA -%token TAG_MARB -%token TAG_MARC -%token TAG_MARL -%token TAG_MARR -%token TAG_MARS -%token TAG_MEDI -%token TAG_NAME -%token TAG_NATI -%token TAG_NATU -%token TAG_NCHI -%token TAG_NICK -%token TAG_NMR -%token TAG_NOTE -%token TAG_NPFX -%token TAG_NSFX -%token TAG_OBJE -%token TAG_OCCU -%token TAG_ORDI -%token TAG_ORDN -%token TAG_PAGE -%token TAG_PEDI -%token TAG_PHON -%token TAG_PLAC -%token TAG_POST -%token TAG_PROB -%token TAG_PROP -%token TAG_PUBL -%token TAG_QUAY -%token TAG_REFN -%token TAG_RELA -%token TAG_RELI -%token TAG_REPO -%token TAG_RESI -%token TAG_RESN -%token TAG_RETI -%token TAG_RFN -%token TAG_RIN -%token TAG_ROLE -%token TAG_SEX -%token TAG_SLGC -%token TAG_SLGS -%token TAG_SOUR -%token TAG_SPFX -%token TAG_SSN -%token TAG_STAE -%token TAG_STAT -%token TAG_SUBM -%token TAG_SUBN -%token TAG_SURN -%token TAG_TEMP -%token TAG_TEXT -%token TAG_TIME -%token TAG_TITL -%token TAG_TRLR -%token TAG_TYPE -%token TAG_VERS -%token TAG_WIFE -%token TAG_WILL - -%type anystdtag -%type anytoptag +%token USERTAG +%token TAG_ABBR +%token TAG_ADDR +%token TAG_ADR1 +%token TAG_ADR2 +%token TAG_ADOP +%token TAG_AFN +%token TAG_AGE +%token TAG_AGNC +%token TAG_ALIA +%token TAG_ANCE +%token TAG_ANCI +%token TAG_ANUL +%token TAG_ASSO +%token TAG_AUTH +%token TAG_BAPL +%token TAG_BAPM +%token TAG_BARM +%token TAG_BASM +%token TAG_BIRT +%token TAG_BLES +%token TAG_BLOB +%token TAG_BURI +%token TAG_CALN +%token TAG_CAST +%token TAG_CAUS +%token TAG_CENS +%token TAG_CHAN +%token TAG_CHAR +%token TAG_CHIL +%token TAG_CHR +%token TAG_CHRA +%token TAG_CITY +%token TAG_CONC +%token TAG_CONF +%token TAG_CONL +%token TAG_CONT +%token TAG_COPR +%token TAG_CORP +%token TAG_CREM +%token TAG_CTRY +%token TAG_DATA +%token TAG_DATE +%token TAG_DEAT +%token TAG_DESC +%token TAG_DESI +%token TAG_DEST +%token TAG_DIV +%token TAG_DIVF +%token TAG_DSCR +%token TAG_EDUC +%token TAG_EMIG +%token TAG_ENDL +%token TAG_ENGA +%token TAG_EVEN +%token TAG_FAM +%token TAG_FAMC +%token TAG_FAMF +%token TAG_FAMS +%token TAG_FCOM +%token TAG_FILE +%token TAG_FORM +%token TAG_GEDC +%token TAG_GIVN +%token TAG_GRAD +%token TAG_HEAD +%token TAG_HUSB +%token TAG_IDNO +%token TAG_IMMI +%token TAG_INDI +%token TAG_LANG +%token TAG_LEGA +%token TAG_MARB +%token TAG_MARC +%token TAG_MARL +%token TAG_MARR +%token TAG_MARS +%token TAG_MEDI +%token TAG_NAME +%token TAG_NATI +%token TAG_NATU +%token TAG_NCHI +%token TAG_NICK +%token TAG_NMR +%token TAG_NOTE +%token TAG_NPFX +%token TAG_NSFX +%token TAG_OBJE +%token TAG_OCCU +%token TAG_ORDI +%token TAG_ORDN +%token TAG_PAGE +%token TAG_PEDI +%token TAG_PHON +%token TAG_PLAC +%token TAG_POST +%token TAG_PROB +%token TAG_PROP +%token TAG_PUBL +%token TAG_QUAY +%token TAG_REFN +%token TAG_RELA +%token TAG_RELI +%token TAG_REPO +%token TAG_RESI +%token TAG_RESN +%token TAG_RETI +%token TAG_RFN +%token TAG_RIN +%token TAG_ROLE +%token TAG_SEX +%token TAG_SLGC +%token TAG_SLGS +%token TAG_SOUR +%token TAG_SPFX +%token TAG_SSN +%token TAG_STAE +%token TAG_STAT +%token TAG_SUBM +%token TAG_SUBN +%token TAG_SURN +%token TAG_TEMP +%token TAG_TEXT +%token TAG_TIME +%token TAG_TITL +%token TAG_TRLR +%token TAG_TYPE +%token TAG_VERS +%token TAG_WIFE +%token TAG_WILL + +%type anystdtag +%type anytoptag +%type fam_event_tag +%type indiv_attr_tag +%type indiv_birt_tag +%type indiv_gen_tag +%type lio_bapl_tag %type line_item -%type line_value %type mand_line_item %type mand_pointer %type note_line_item @@ -398,17 +415,14 @@ int compat_mode(int flags); %type opt_xref %type opt_value %type opt_line_item -%type fam_event_tag -%type indiv_attr_tag -%type indiv_birt_tag -%type indiv_gen_tag -%type lio_bapl_tag %type head_sect %% file : head_sect records trlr_sect { if (fail == 1) YYABORT; } + | error + { } ; records : /* empty */ @@ -430,16 +444,29 @@ record : fam_rec /**** Header ****/ /*********************************************************************/ head_sect : OPEN DELIM TAG_HEAD - { $$ = start_record(REC_HEAD, $1, NULL, $3); + { $$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1), + $3, + NULL, GEDCOM_MAKE_NULL(val2)); START(HEAD, $$) } head_subs - { if (compat_mode(C_FTREE)) - CHECK3(SOUR, GEDC, CHAR) + { if (compat_mode(C_FTREE)) { + CHECK3(SOUR, GEDC, CHAR); + compat_generate_submitter_link($4); + } + else if (compat_mode(C_LIFELINES)) { + CHECK1(SOUR); + compat_generate_submitter_link($4); + compat_generate_gedcom($4); + if (compat_generate_char($4)) YYABORT; + } else CHECK4(SOUR, SUBM, GEDC, CHAR) } CLOSE - { end_record(REC_HEAD, $4); } + { end_record(REC_HEAD, $4); + if (compat_mode(C_FTREE | C_LIFELINES)) + compat_generate_submitter(); + } ; head_subs : /* empty */ @@ -449,6 +476,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_LIFELINES)) + 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) } @@ -466,7 +496,7 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item { set_compatibility($4); $$ = start_element(ELT_HEAD_SOUR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(SOUR, $$) } head_sour_subs @@ -489,7 +519,7 @@ 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, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(VERS, $$) } no_std_subs @@ -502,7 +532,7 @@ head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_HEAD_SOUR_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NAME, $$) } no_std_subs @@ -514,8 +544,8 @@ head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item ; head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item { $$ = start_element(ELT_HEAD_SOUR_CORP, PARENT, - $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(CORP, $$) } head_sour_corp_subs @@ -536,8 +566,8 @@ head_sour_corp_sub : addr_struc_sub /* 0:1 */ head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item { $$ = start_element(ELT_HEAD_SOUR_DATA, PARENT, - $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(DATA, $$) } head_sour_data_subs @@ -559,9 +589,10 @@ head_sour_data_sub : head_sour_data_date_sect { OCCUR2(DATE, 0, 1) } head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_HEAD_SOUR_DATA_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + $$ + = start_element(ELT_HEAD_SOUR_DATA_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -572,9 +603,10 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item } ; head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item - { $$ = start_element(ELT_HEAD_SOUR_DATA_COPR, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_HEAD_SOUR_DATA_COPR, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(COPR, $$) } no_std_subs @@ -588,8 +620,8 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item /* HEAD.DEST */ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item { $$ = start_element(ELT_HEAD_DEST, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(DEST, $$) } no_std_subs @@ -604,8 +636,8 @@ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item head_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_HEAD_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } head_date_subs @@ -626,8 +658,8 @@ head_date_sub : head_date_time_sect { OCCUR2(TIME, 0, 1) } head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { $$ = start_element(ELT_HEAD_DATE_TIME, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(TIME, $$) } no_std_subs @@ -638,11 +670,21 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item } ; +/* HEAD.TIME (Only for 'Lifelines' compatibility) */ +/* Just ignore the time... */ +head_time_sect : OPEN DELIM TAG_TIME opt_line_item + { } + CLOSE + ; + /* HEAD.SUBM */ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_HEAD_SUBM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_HEAD_SUBM, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SUBM, $$) } no_std_subs @@ -654,9 +696,12 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer ; /* HEAD.SUBN */ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer - { $$ = start_element(ELT_HEAD_SUBN, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBN); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_HEAD_SUBN, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SUBN, $$) } no_std_subs @@ -669,8 +714,8 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer /* HEAD.FILE */ head_file_sect : OPEN DELIM TAG_FILE mand_line_item { $$ = start_element(ELT_HEAD_FILE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(FILE, $$) } no_std_subs @@ -682,8 +727,8 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item /* HEAD.COPR */ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item { $$ = start_element(ELT_HEAD_COPR, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(COPR, $$) } no_std_subs @@ -696,7 +741,7 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item head_gedc_sect : OPEN DELIM TAG_GEDC { $$ = start_element(ELT_HEAD_GEDC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(GEDC, $$) } head_gedc_subs @@ -716,8 +761,8 @@ head_gedc_sub : head_gedc_vers_sect { OCCUR2(VERS, 1, 1) } ; head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_GEDC_VERS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(VERS, $$) } no_std_subs @@ -729,8 +774,8 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item ; head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_HEAD_GEDC_FORM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(FORM, $$) } no_std_subs @@ -743,10 +788,12 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item /* HEAD.CHAR */ head_char_sect : OPEN DELIM TAG_CHAR mand_line_item - { if (open_conv_to_internal($4) == 0) YYERROR; + { /* Don't allow to continue if conversion context couldn't + be opened */ + if (open_conv_to_internal($4) == 0) YYABORT; $$ = start_element(ELT_HEAD_CHAR, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(CHAR, $$) } head_char_subs @@ -765,8 +812,8 @@ head_char_sub : head_char_vers_sect { OCCUR2(VERS, 0, 1) } ; head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item { $$ = start_element(ELT_HEAD_CHAR_VERS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(VERS, $$) } no_std_subs @@ -780,8 +827,8 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item /* HEAD.LANG */ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_HEAD_LANG, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(LANG, $$) } no_std_subs @@ -794,7 +841,7 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item head_plac_sect : OPEN DELIM TAG_PLAC { $$ = start_element(ELT_HEAD_PLAC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(PLAC, $$) } head_plac_subs @@ -814,7 +861,7 @@ head_plac_sub : head_plac_form_sect { OCCUR2(FORM, 1, 1) } head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_HEAD_PLAC_FORM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(FORM, $$) } no_std_subs @@ -829,7 +876,7 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item head_note_sect : OPEN DELIM TAG_NOTE mand_line_item { $$ = start_element(ELT_HEAD_NOTE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NOTE, $$) } head_note_subs @@ -858,7 +905,13 @@ trlr_sect : OPEN DELIM TAG_TRLR CLOSE { } /**** Family record ****/ /*********************************************************************/ fam_rec : OPEN DELIM POINTER DELIM TAG_FAM - { $$ = start_record(REC_FAM, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_FAM, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), + $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(FAM, $$) } fam_subs { CHECK0 } @@ -887,9 +940,12 @@ fam_sub : fam_event_struc_sub /* 0:M */ /* FAM.HUSB */ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer - { $$ = start_element(ELT_FAM_HUSB, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_HUSB, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(HUSB, $$) } no_std_subs @@ -901,9 +957,12 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer /* FAM.WIFE */ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer - { $$ = start_element(ELT_FAM_WIFE, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_WIFE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(WIFE, $$) } no_std_subs @@ -915,9 +974,12 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer /* FAM.CHIL */ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer - { $$ = start_element(ELT_FAM_CHIL, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_CHIL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(CHIL, $$) } no_std_subs @@ -931,7 +993,7 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item { $$ = start_element(ELT_FAM_NCHI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NCHI, $$) } no_std_subs @@ -943,9 +1005,12 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item /* FAM.SUBM */ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_FAM_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_FAM_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SUBM, $$) } no_std_subs @@ -959,7 +1024,12 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer /**** Individual record ****/ /*********************************************************************/ indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI - { $$ = start_record(REC_INDI, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_INDI, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(INDI, $$) } indi_subs { CHECK0 } @@ -1001,7 +1071,7 @@ indi_sub : indi_resn_sect { OCCUR2(RESN, 0, 1) } indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item { $$ = start_element(ELT_INDI_RESN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RESN, $$) } no_std_subs @@ -1015,7 +1085,7 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item { $$ = start_element(ELT_INDI_SEX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(SEX, $$) } no_std_subs @@ -1027,9 +1097,12 @@ indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item /* INDI.SUBM */ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_INDI_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SUBM, $$) } no_std_subs @@ -1041,9 +1114,12 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer /* INDI.ALIA */ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer - { $$ = start_element(ELT_INDI_ALIA, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_ALIA, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(ALIA, $$) } no_std_subs @@ -1055,9 +1131,12 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer /* INDI.ANCI */ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer - { $$ = start_element(ELT_INDI_ANCI, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_ANCI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(ANCI, $$) } no_std_subs @@ -1069,9 +1148,12 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer /* INDI.DESI */ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer - { $$ = start_element(ELT_INDI_DESI, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_INDI_DESI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(DESI, $$) } no_std_subs @@ -1085,7 +1167,7 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_INDI_RFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RFN, $$) } no_std_subs @@ -1099,7 +1181,7 @@ indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item { $$ = start_element(ELT_INDI_AFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(AFN, $$) } no_std_subs @@ -1111,13 +1193,62 @@ indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item /* INDI.ADDR (Only for 'ftree' compatibility) */ ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item - { START(ADDR, NULL) } no_std_subs { CHECK0 } CLOSE { } + { if (compat_mode(C_FTREE)) { + 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, $$); + } + else { START(ADDR, NULL) } + } + ftree_addr_subs + { CHECK0 } + CLOSE + { if (compat_mode(C_FTREE)) { + Gedcom_ctxt par = PARENT; + end_element(ELT_SUB_ADDR, par, $5, NULL); + 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, $$) + } + no_std_subs + { CHECK0 } + CLOSE + { end_element(ELT_SUB_PHON, GRANDPARENT(1), + $5, NULL); + } + ; /*********************************************************************/ /**** Multimedia record ****/ /*********************************************************************/ multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE - { $$ = start_record(REC_OBJE, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_OBJE, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(OBJE, $$) } obje_subs { CHECK2(FORM, BLOB) } @@ -1143,7 +1274,7 @@ obje_sub : obje_form_sect { OCCUR2(FORM, 1, 1) } obje_form_sect : OPEN DELIM TAG_FORM mand_line_item { $$ = start_element(ELT_OBJE_FORM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(FORM, $$) } no_std_subs @@ -1157,7 +1288,7 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_OBJE_TITL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TITL, $$) } no_std_subs @@ -1171,7 +1302,7 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item obje_blob_sect : OPEN DELIM TAG_BLOB { $$ = start_element(ELT_OBJE_BLOB, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(BLOB, $$) } obje_blob_subs @@ -1192,7 +1323,7 @@ obje_blob_sub : obje_blob_cont_sect { OCCUR1(CONT, 1) } obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_OBJE_BLOB_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CONT, $$) } no_std_subs @@ -1205,9 +1336,12 @@ obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item /* OBJE.OBJE */ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer - { $$ = start_element(ELT_OBJE_OBJE, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_OBJE_OBJE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(OBJE, $$) } no_std_subs @@ -1221,18 +1355,26 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer /**** Note record ****/ /*********************************************************************/ note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item - { $$ = start_record(REC_NOTE, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_NOTE); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_NOTE, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + $6, GEDCOM_MAKE_STRING(val2, $6)); START(NOTE, $$) } note_subs { CHECK0 } CLOSE - { end_record(REC_NOTE, $6); } + { end_record(REC_NOTE, $7); } ; note_line_item : /* empty */ { if (!compat_mode(C_FTREE)) { gedcom_error(_("Missing value")); YYERROR; } + else { + $$ = ""; + } } | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); @@ -1254,7 +1396,12 @@ note_sub : continuation_sub /* 0:M */ /**** Repository record ****/ /*********************************************************************/ repos_rec : OPEN DELIM POINTER DELIM TAG_REPO - { $$ = start_record(REC_REPO, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_REPO); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_REPO, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(REPO, $$) } repo_subs { CHECK0 } @@ -1278,7 +1425,7 @@ repo_sub : repo_name_sect { OCCUR2(NAME, 0, 1) } repo_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_REPO_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NAME, $$) } no_std_subs @@ -1292,7 +1439,12 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item /**** Source record ****/ /*********************************************************************/ source_rec : OPEN DELIM POINTER DELIM TAG_SOUR - { $$ = start_record(REC_SOUR, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SOUR); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SOUR, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(SOUR, $$) } sour_subs { CHECK0 } @@ -1322,7 +1474,7 @@ sour_sub : sour_data_sect { OCCUR2(DATA, 0, 1) } sour_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SOUR_DATA, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(DATA, $$) } sour_data_subs @@ -1345,7 +1497,7 @@ sour_data_sub : sour_data_even_sect /* 0:M */ sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item { $$ = start_element(ELT_SOUR_DATA_EVEN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(EVEN, $$) } sour_data_even_subs @@ -1367,9 +1519,10 @@ sour_data_even_sub : sour_data_even_date_sect { OCCUR2(DATE, 0, 1) } sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SOUR_DATA_EVEN_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + $$ + = start_element(ELT_SOUR_DATA_EVEN_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -1381,9 +1534,10 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item ; sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item - { $$ = start_element(ELT_SOUR_DATA_EVEN_PLAC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SOUR_DATA_EVEN_PLAC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(PLAC, $$) } no_std_subs @@ -1397,7 +1551,7 @@ sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item { $$ = start_element(ELT_SOUR_DATA_AGNC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(AGNC, $$) } no_std_subs @@ -1412,7 +1566,7 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item { $$ = start_element(ELT_SOUR_AUTH, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(AUTH, $$) } sour_auth_subs @@ -1434,7 +1588,7 @@ sour_auth_sub : continuation_sub /* 0:M */ sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item { $$ = start_element(ELT_SOUR_TITL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TITL, $$) } sour_titl_subs @@ -1456,7 +1610,7 @@ sour_titl_sub : continuation_sub /* 0:M */ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item { $$ = start_element(ELT_SOUR_ABBR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ABBR, $$) } no_std_subs @@ -1470,7 +1624,7 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item { $$ = start_element(ELT_SOUR_PUBL, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(PUBL, $$) } sour_publ_subs @@ -1492,7 +1646,7 @@ sour_publ_sub : continuation_sub /* 0:M */ sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item { $$ = start_element(ELT_SOUR_TEXT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TEXT, $$) } sour_text_subs @@ -1514,7 +1668,12 @@ sour_text_sub : continuation_sub /* 0:M */ /**** Submission record ****/ /*********************************************************************/ submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN - { $$ = start_record(REC_SUBN, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SUBN); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SUBN, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(SUBN, $$) } subn_subs { CHECK0 } @@ -1538,9 +1697,12 @@ subn_sub : subn_subm_sect { OCCUR2(SUBM, 0, 1) } /* SUBN.SUBM */ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer - { $$ = start_element(ELT_SUBN_SUBM, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUBN_SUBM, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SUBM, $$) } no_std_subs @@ -1554,7 +1716,7 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item { $$ = start_element(ELT_SUBN_FAMF, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(FAMF, $$) } no_std_subs @@ -1568,7 +1730,7 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUBN_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TEMP, $$) } no_std_subs @@ -1582,7 +1744,7 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item { $$ = start_element(ELT_SUBN_ANCE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ANCE, $$) } no_std_subs @@ -1596,7 +1758,7 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item { $$ = start_element(ELT_SUBN_DESC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(DESC, $$) } no_std_subs @@ -1610,7 +1772,7 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item { $$ = start_element(ELT_SUBN_ORDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ORDI, $$) } no_std_subs @@ -1624,7 +1786,7 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBN_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RIN, $$) } no_std_subs @@ -1638,7 +1800,12 @@ subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item /**** Submitter record ****/ /*********************************************************************/ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM - { $$ = start_record(REC_SUBM, $1, $3, $5); + { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED, + XREF_SUBM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_record(REC_SUBM, + $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, + NULL, GEDCOM_MAKE_NULL(val2)); START(SUBM, $$) } subm_subs { CHECK1(NAME) } @@ -1650,7 +1817,7 @@ subm_subs : /* empty */ | subm_subs subm_sub ; -subm_sub : subm_name_sect { OCCUR2(NAME, 0, 1) } +subm_sub : subm_name_sect { OCCUR2(NAME, 1, 1) } | addr_struc_sub /* 0:1 */ | multim_link_sub /* 0:M */ | subm_lang_sect { OCCUR2(LANG, 0, 3) } @@ -1664,7 +1831,7 @@ subm_sub : subm_name_sect { OCCUR2(NAME, 0, 1) } subm_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUBM_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NAME, $$) } no_std_subs @@ -1678,7 +1845,7 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item { $$ = start_element(ELT_SUBM_LANG, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(LANG, $$) } no_std_subs @@ -1692,7 +1859,7 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item { $$ = start_element(ELT_SUBM_RFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RFN, $$) } no_std_subs @@ -1706,7 +1873,7 @@ subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUBM_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RIN, $$) } no_std_subs @@ -1728,7 +1895,7 @@ addr_struc_sub : addr_sect { OCCUR2(ADDR, 0, 1) } addr_sect : OPEN DELIM TAG_ADDR mand_line_item { $$ = start_element(ELT_SUB_ADDR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ADDR, $$) } addr_subs @@ -1755,7 +1922,7 @@ addr_sub : addr_cont_sect /* 0:M */ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_ADDR_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CONT, $$) } no_std_subs @@ -1767,7 +1934,7 @@ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item { $$ = start_element(ELT_SUB_ADDR_ADR1, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ADR1, $$) } no_std_subs @@ -1779,7 +1946,7 @@ addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item { $$ = start_element(ELT_SUB_ADDR_ADR2, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ADR2, $$) } no_std_subs @@ -1791,7 +1958,7 @@ addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item addr_city_sect : OPEN DELIM TAG_CITY mand_line_item { $$ = start_element(ELT_SUB_ADDR_CITY, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CITY, $$) } no_std_subs @@ -1803,7 +1970,7 @@ addr_city_sect : OPEN DELIM TAG_CITY mand_line_item addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item { $$ = start_element(ELT_SUB_ADDR_STAE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(STAE, $$) } no_std_subs @@ -1815,7 +1982,7 @@ addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item addr_post_sect : OPEN DELIM TAG_POST mand_line_item { $$ = start_element(ELT_SUB_ADDR_POST, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(POST, $$) } no_std_subs @@ -1827,7 +1994,7 @@ addr_post_sect : OPEN DELIM TAG_POST mand_line_item addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item { $$ = start_element(ELT_SUB_ADDR_CTRY, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CTRY, $$) } no_std_subs @@ -1840,7 +2007,7 @@ addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item phon_sect : OPEN DELIM TAG_PHON mand_line_item { $$ = start_element(ELT_SUB_PHON, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(PHON, $$) } no_std_subs @@ -1855,9 +2022,12 @@ assoc_struc_sub : asso_sect /* 0:M */ ; asso_sect : OPEN DELIM TAG_ASSO mand_pointer - { $$ = start_element(ELT_SUB_ASSO, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_INDI); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUB_ASSO, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(ASSO, $$) } asso_subs @@ -1878,7 +2048,7 @@ asso_subs : /* empty */ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item { $$ = start_element(ELT_SUB_ASSO_TYPE, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TYPE, $$) } no_std_subs @@ -1891,7 +2061,7 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item { $$ = start_element(ELT_SUB_ASSO_RELA, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RELA, $$) } no_std_subs @@ -1908,7 +2078,7 @@ change_date_sub : change_date_chan_sect { OCCUR2(CHAN, 0, 1) } change_date_chan_sect : OPEN DELIM TAG_CHAN { $$ = start_element(ELT_SUB_CHAN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(CHAN, $$) } change_date_chan_subs @@ -1931,7 +2101,7 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_CHAN_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } change_date_date_subs { CHECK0 } @@ -1953,7 +2123,7 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item { $$ = start_element(ELT_SUB_CHAN_TIME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TIME, $$) } no_std_subs @@ -1969,9 +2139,12 @@ chi_fam_link_sub : famc_sect /* 0:M */ ; famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_FAMC, + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ = start_element(ELT_SUB_FAMC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(FAMC, $$) } famc_subs @@ -1993,7 +2166,7 @@ famc_sub : famc_pedi_sect /* 0:M */ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item { $$ = start_element(ELT_SUB_FAMC_PEDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(PEDI, $$) } no_std_subs @@ -2011,7 +2184,7 @@ continuation_sub : cont_sect /* 0:M */ cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CONT, $$) } no_std_subs @@ -2024,7 +2197,7 @@ cont_sect : OPEN DELIM TAG_CONT mand_line_item conc_sect : OPEN DELIM TAG_CONC mand_line_item { $$ = start_element(ELT_SUB_CONC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CONC, $$) } no_std_subs @@ -2048,9 +2221,10 @@ event_detail_sub : event_detail_type_sect { OCCUR2(TYPE, 0, 1) } ; event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item - { $$ = start_element(ELT_SUB_EVT_TYPE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_EVT_TYPE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(TYPE, $$) } no_std_subs @@ -2062,9 +2236,10 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item ; event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SUB_EVT_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + $$ + = start_element(ELT_SUB_EVT_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -2075,9 +2250,10 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item } ; event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item - { $$ = start_element(ELT_SUB_EVT_AGE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_EVT_AGE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(AGE, $$) } no_std_subs @@ -2088,9 +2264,10 @@ event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item } ; event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item - { $$ = start_element(ELT_SUB_EVT_AGNC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_EVT_AGNC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(AGNC, $$) } no_std_subs @@ -2101,9 +2278,10 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item } ; event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item - { $$ = start_element(ELT_SUB_EVT_CAUS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_EVT_CAUS, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(CAUS, $$) } no_std_subs @@ -2120,12 +2298,11 @@ fam_event_struc_sub : fam_event_sect ; fam_event_sect : OPEN DELIM fam_event_tag opt_value - { - $$ = start_element(ELT_SUB_FAM_EVT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_FAM_EVT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($$); } fam_event_subs { CHECK0 } @@ -2134,16 +2311,16 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value } ; -fam_event_tag : TAG_ANUL { $$ = $1; START(ANUL, NULL) } - | TAG_CENS { $$ = $1; START(CENS, NULL) } - | TAG_DIV { $$ = $1; START(DIV, NULL) } - | TAG_DIVF { $$ = $1; START(DIVF, NULL) } - | TAG_ENGA { $$ = $1; START(ENGA, NULL) } - | TAG_MARR { $$ = $1; START(MARR, NULL) } - | TAG_MARB { $$ = $1; START(MARB, NULL) } - | TAG_MARC { $$ = $1; START(MARC, NULL) } - | TAG_MARL { $$ = $1; START(MARL, NULL) } - | TAG_MARS { $$ = $1; START(MARS, NULL) } +fam_event_tag : TAG_ANUL { $$ = $1; START1(ANUL) } + | TAG_CENS { $$ = $1; START1(CENS) } + | TAG_DIV { $$ = $1; START1(DIV) } + | TAG_DIVF { $$ = $1; START1(DIVF) } + | TAG_ENGA { $$ = $1; START1(ENGA) } + | TAG_MARR { $$ = $1; START1(MARR) } + | TAG_MARB { $$ = $1; START1(MARB) } + | TAG_MARC { $$ = $1; START1(MARC) } + | TAG_MARL { $$ = $1; START1(MARL) } + | TAG_MARS { $$ = $1; START1(MARS) } ; fam_event_subs : /* empty */ @@ -2159,7 +2336,7 @@ fam_event_sub : event_detail_sub fam_even_husb_sect : OPEN DELIM TAG_HUSB { $$ = start_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(HUSB, $$) } fam_even_husb_subs @@ -2181,7 +2358,7 @@ 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, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(AGE, $$) } no_std_subs @@ -2195,7 +2372,7 @@ fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item fam_even_wife_sect : OPEN DELIM TAG_WIFE { $$ = start_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(WIFE, $$) } fam_even_husb_subs @@ -2209,7 +2386,7 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE fam_gen_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(EVEN, $$) } fam_gen_even_subs @@ -2238,7 +2415,7 @@ ident_struc_sub : ident_refn_sect /* 0:M */ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item { $$ = start_element(ELT_SUB_IDENT_REFN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(REFN, $$) } ident_refn_subs @@ -2258,9 +2435,10 @@ ident_refn_sub : ident_refn_type_sect { OCCUR2(TYPE, 0, 1) } ; ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item - { $$ = start_element(ELT_SUB_IDENT_REFN_TYPE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_IDENT_REFN_TYPE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(TYPE, $$) } no_std_subs @@ -2274,7 +2452,7 @@ ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item { $$ = start_element(ELT_SUB_IDENT_RIN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(RIN, $$) } no_std_subs @@ -2293,9 +2471,8 @@ indiv_attr_struc_sub : indiv_attr_sect /* 0:M */ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item { $$ = start_element(ELT_SUB_INDIV_ATTR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + GEDCOM_MAKE_STRING(val1, $4)); + START2($$); } indiv_attr_event_subs { CHECK0 } @@ -2303,23 +2480,23 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item { end_element(ELT_SUB_INDIV_ATTR, PARENT, $5, NULL); } -indiv_attr_tag : TAG_CAST { $$ = $1; START(CAST, NULL) } - | TAG_DSCR { $$ = $1; START(DSCR, NULL) } - | TAG_EDUC { $$ = $1; START(EDUC, NULL) } - | TAG_IDNO { $$ = $1; START(IDNO, NULL) } - | TAG_NATI { $$ = $1; START(NATI, NULL) } - | TAG_NCHI { $$ = $1; START(NCHI, NULL) } - | TAG_NMR { $$ = $1; START(NMR, NULL) } - | TAG_OCCU { $$ = $1; START(OCCU, NULL) } - | TAG_PROP { $$ = $1; START(PROP, NULL) } - | TAG_RELI { $$ = $1; START(RELI, NULL) } - | TAG_SSN { $$ = $1; START(SSN, NULL) } - | TAG_TITL { $$ = $1; START(TITL, NULL) } +indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) } + | TAG_DSCR { $$ = $1; START1(DSCR) } + | TAG_EDUC { $$ = $1; START1(EDUC) } + | TAG_IDNO { $$ = $1; START1(IDNO) } + | TAG_NATI { $$ = $1; START1(NATI) } + | TAG_NCHI { $$ = $1; START1(NCHI) } + | TAG_NMR { $$ = $1; START1(NMR) } + | TAG_OCCU { $$ = $1; START1(OCCU) } + | TAG_PROP { $$ = $1; START1(PROP) } + | TAG_RELI { $$ = $1; START1(RELI) } + | TAG_SSN { $$ = $1; START1(SSN) } + | TAG_TITL { $$ = $1; START1(TITL) } indiv_resi_sect : OPEN DELIM TAG_RESI { $$ = start_element(ELT_SUB_INDIV_RESI, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(RESI, $$) } indiv_attr_event_subs @@ -2345,11 +2522,11 @@ indiv_even_struc_sub : indiv_birt_sect ; indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value - { $$ = start_element(ELT_SUB_INDIV_BIRT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_INDIV_BIRT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($$); } indiv_birt_subs { CHECK0 } @@ -2358,8 +2535,8 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value } ; -indiv_birt_tag : TAG_BIRT { $$ = $1; START(BIRT, NULL) } - | TAG_CHR { $$ = $1; START(CHR, NULL) } +indiv_birt_tag : TAG_BIRT { $$ = $1; START1(BIRT) } + | TAG_CHR { $$ = $1; START1(CHR) } ; indiv_birt_subs : /* empty */ @@ -2372,9 +2549,14 @@ indiv_birt_sub : event_detail_sub ; indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_INDIV_BIRT_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, + XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_INDIV_BIRT_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(FAMC, $$) } no_std_subs @@ -2386,11 +2568,11 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer ; indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value - { $$ = start_element(ELT_SUB_INDIV_GEN, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); - /* set the parent context separately from START here */ - set_parentctxt($$); + { $$ + = start_element(ELT_SUB_INDIV_GEN, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + START2($$); } indiv_gen_subs { CHECK0 } @@ -2399,25 +2581,25 @@ indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value } ; -indiv_gen_tag : TAG_DEAT { $$ = $1; START(DEAT, NULL) } - | TAG_BURI { $$ = $1; START(BURI, NULL) } - | TAG_CREM { $$ = $1; START(CREM, NULL) } - | TAG_BAPM { $$ = $1; START(BAPM, NULL) } - | TAG_BARM { $$ = $1; START(BARM, NULL) } - | TAG_BASM { $$ = $1; START(BASM, NULL) } - | TAG_BLES { $$ = $1; START(BLES, NULL) } - | TAG_CHRA { $$ = $1; START(CHRA, NULL) } - | TAG_CONF { $$ = $1; START(CONF, NULL) } - | TAG_FCOM { $$ = $1; START(FCOM, NULL) } - | TAG_ORDN { $$ = $1; START(ORDN, NULL) } - | TAG_NATU { $$ = $1; START(NATU, NULL) } - | TAG_EMIG { $$ = $1; START(EMIG, NULL) } - | TAG_IMMI { $$ = $1; START(IMMI, NULL) } - | TAG_CENS { $$ = $1; START(CENS, NULL) } - | TAG_PROB { $$ = $1; START(PROB, NULL) } - | TAG_WILL { $$ = $1; START(WILL, NULL) } - | TAG_GRAD { $$ = $1; START(GRAD, NULL) } - | TAG_RETI { $$ = $1; START(RETI, NULL) } +indiv_gen_tag : TAG_DEAT { $$ = $1; START1(DEAT) } + | TAG_BURI { $$ = $1; START1(BURI) } + | TAG_CREM { $$ = $1; START1(CREM) } + | TAG_BAPM { $$ = $1; START1(BAPM) } + | TAG_BARM { $$ = $1; START1(BARM) } + | TAG_BASM { $$ = $1; START1(BASM) } + | TAG_BLES { $$ = $1; START1(BLES) } + | TAG_CHRA { $$ = $1; START1(CHRA) } + | TAG_CONF { $$ = $1; START1(CONF) } + | TAG_FCOM { $$ = $1; START1(FCOM) } + | TAG_ORDN { $$ = $1; START1(ORDN) } + | TAG_NATU { $$ = $1; START1(NATU) } + | TAG_EMIG { $$ = $1; START1(EMIG) } + | TAG_IMMI { $$ = $1; START1(IMMI) } + | TAG_CENS { $$ = $1; START1(CENS) } + | TAG_PROB { $$ = $1; START1(PROB) } + | TAG_WILL { $$ = $1; START1(WILL) } + | TAG_GRAD { $$ = $1; START1(GRAD) } + | TAG_RETI { $$ = $1; START1(RETI) } ; indiv_gen_subs : /* empty */ @@ -2429,9 +2611,10 @@ indiv_gen_sub : event_detail_sub ; indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value - { $$ = start_element(ELT_SUB_INDIV_ADOP, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING($4)); + { $$ + = start_element(ELT_SUB_INDIV_ADOP, + PARENT, $1, $3, $4, + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); START(ADOP, $$) } indiv_adop_subs { CHECK0 } @@ -2450,9 +2633,14 @@ indiv_adop_sub : event_detail_sub ; indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_INDIV_ADOP_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, + XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_INDIV_ADOP_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(FAMC, $$) } indiv_adop_famc_subs { CHECK0 } @@ -2474,7 +2662,7 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item { $$ = start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(ADOP, $$) } no_std_subs { CHECK0 } @@ -2487,7 +2675,7 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item indiv_even_sect : OPEN DELIM TAG_EVEN { $$ = start_element(ELT_SUB_INDIV_EVEN, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(EVEN, $$) } indiv_gen_subs { CHECK0 } @@ -2504,9 +2692,8 @@ lds_indiv_ord_sub : lio_bapl_sect /* 0:M */ lio_bapl_sect : OPEN DELIM lio_bapl_tag { $$ = start_element(ELT_SUB_LIO_BAPL, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); - /* set the parent context separately from START here */ - set_parentctxt($$); + GEDCOM_MAKE_NULL(val1)); + START2($$); } lio_bapl_subs { CHECK0 } @@ -2515,9 +2702,9 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag } ; -lio_bapl_tag : TAG_BAPL { $$ = $1; START(BAPL, NULL) } - | TAG_CONL { $$ = $1; START(CONL, NULL) } - | TAG_ENDL { $$ = $1; START(ENDL, NULL) } +lio_bapl_tag : TAG_BAPL { $$ = $1; START1(BAPL) } + | TAG_CONL { $$ = $1; START1(CONL) } + | TAG_ENDL { $$ = $1; START1(ENDL) } ; lio_bapl_subs : /* empty */ @@ -2536,7 +2723,7 @@ lio_bapl_sub : lio_bapl_stat_sect { OCCUR2(STAT, 0, 1) } lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(STAT, $$) } no_std_subs @@ -2550,7 +2737,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -2563,7 +2750,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TEMP, $$) } no_std_subs @@ -2576,7 +2763,7 @@ lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { $$ = start_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(PLAC, $$) } no_std_subs @@ -2590,7 +2777,7 @@ lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item lio_slgc_sect : OPEN DELIM TAG_SLGC { $$ = start_element(ELT_SUB_LIO_SLGC, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(SLGC, $$) } lio_slgc_subs @@ -2609,9 +2796,13 @@ lio_slgc_sub : lio_bapl_sub ; lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer - { $$ = start_element(ELT_SUB_LIO_SLGC_FAMC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_LIO_SLGC_FAMC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(FAMC, $$) } no_std_subs @@ -2629,7 +2820,7 @@ lds_spouse_seal_sub : lss_slgs_sect lss_slgs_sect : OPEN DELIM TAG_SLGS { $$ = start_element(ELT_SUB_LSS_SLGS, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(SLGS, $$) } lss_slgs_subs { CHECK0 } @@ -2654,7 +2845,7 @@ lss_slgs_sub : lss_slgs_stat_sect { OCCUR2(STAT, 0, 1) } lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(STAT, $$) } no_std_subs @@ -2668,7 +2859,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); $$ = start_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -2681,7 +2872,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(TEMP, $$) } no_std_subs @@ -2694,7 +2885,7 @@ lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item { $$ = start_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(PLAC, $$) } no_std_subs @@ -2711,9 +2902,14 @@ multim_link_sub : multim_obje_link_sect ; multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER - { $$ = start_element(ELT_SUB_MULTIM_OBJE, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_OBJE); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_MULTIM_OBJE, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(OBJE, $$) } no_std_subs @@ -2727,7 +2923,7 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER multim_obje_emb_sect : OPEN DELIM TAG_OBJE { $$ = start_element(ELT_SUB_MULTIM_OBJE, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(OBJE, $$) } multim_obje_emb_subs @@ -2750,9 +2946,10 @@ multim_obje_emb_sub : multim_obje_form_sect { OCCUR2(FORM, 1, 1) } ; multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_FORM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_FORM, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(FORM, $$) } no_std_subs @@ -2763,9 +2960,10 @@ multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item } ; multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_TITL, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_TITL, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(TITL, $$) } no_std_subs @@ -2776,9 +2974,10 @@ multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item } ; multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item - { $$ = start_element(ELT_SUB_MULTIM_OBJE_FILE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_MULTIM_OBJE_FILE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(FILE, $$) } no_std_subs @@ -2795,9 +2994,14 @@ note_struc_sub : note_struc_link_sect /* 0:M */ ; note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER - { $$ = start_element(ELT_SUB_NOTE, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_NOTE); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_NOTE, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(NOTE, $$) } note_struc_link_subs @@ -2819,7 +3023,7 @@ 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($4)); + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); START(NOTE, $$) } note_struc_emb_subs @@ -2845,7 +3049,7 @@ pers_name_struc_sub : pers_name_sect /* 0:M */ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NAME, $$) } pers_name_subs @@ -2873,7 +3077,7 @@ pers_name_sub : pers_name_npfx_sect { OCCUR2(NPFX, 0, 1) } pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NPFX, $$) } no_std_subs @@ -2886,7 +3090,7 @@ pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(GIVN, $$) } no_std_subs @@ -2899,7 +3103,7 @@ pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NICK, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NICK, $$) } no_std_subs @@ -2912,7 +3116,7 @@ pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(SPFX, $$) } no_std_subs @@ -2925,7 +3129,7 @@ pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_SURN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(SURN, $$) } no_std_subs @@ -2938,7 +3142,7 @@ pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item { $$ = start_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(NSFX, $$) } no_std_subs @@ -2954,9 +3158,10 @@ place_struc_sub : place_struc_plac_sect /* 0:M */ ; place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item - { $$ = start_element(ELT_SUB_PLAC, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_PLAC, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(PLAC, $$) } place_struc_plac_subs @@ -2977,9 +3182,10 @@ place_struc_plac_sub : place_plac_form_sect { OCCUR2(FORM, 0, 1) } ; place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item - { $$ = start_element(ELT_SUB_PLAC_FORM, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_PLAC_FORM, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(FORM, $$) } no_std_subs @@ -2996,9 +3202,14 @@ source_cit_sub : source_cit_link_sect /* 0:M */ ; source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER - { $$ = start_element(ELT_SUB_SOUR, - PARENT, $1, $3, $5, - GEDCOM_MAKE_STRING($5)); + { struct xref_value *xr = gedcom_parse_xref($5, + XREF_USED, + XREF_SOUR); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_SOUR, + PARENT, $1, $3, $5, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(SOUR, $$) } source_cit_link_subs @@ -3022,9 +3233,10 @@ source_cit_link_sub : source_cit_page_sect { OCCUR2(PAGE, 0, 1) } ; source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item - { $$ = start_element(ELT_SUB_SOUR_PAGE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_SOUR_PAGE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(PAGE, $$) } no_std_subs @@ -3036,9 +3248,10 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item ; source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item - { $$ = start_element(ELT_SUB_SOUR_EVEN, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_SOUR_EVEN, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(EVEN, $$) } source_cit_even_subs @@ -3058,9 +3271,10 @@ source_cit_even_sub : source_cit_even_role_sect { OCCUR2(ROLE, 0, 1) } ; source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item - { $$ = start_element(ELT_SUB_SOUR_EVEN_ROLE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_SOUR_EVEN_ROLE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(ROLE, $$) } no_std_subs @@ -3074,7 +3288,7 @@ source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item source_cit_data_sect : OPEN DELIM TAG_DATA { $$ = start_element(ELT_SUB_SOUR_DATA, PARENT, $1, $3, NULL, - GEDCOM_MAKE_NULL()); + GEDCOM_MAKE_NULL(val1)); START(DATA, $$) } source_cit_data_subs @@ -3096,9 +3310,10 @@ source_cit_data_sub : source_cit_data_date_sect { OCCUR2(DATE, 0, 1) } source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item { struct date_value dv = gedcom_parse_date($4); - $$ = start_element(ELT_SUB_SOUR_DATA_DATE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_DATE(dv)); + $$ + = start_element(ELT_SUB_SOUR_DATA_DATE, + PARENT, $1, $3, $4, + GEDCOM_MAKE_DATE(val1, dv)); START(DATE, $$) } no_std_subs @@ -3110,9 +3325,10 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item ; source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item - { $$ = start_element(ELT_SUB_SOUR_TEXT, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_SOUR_TEXT, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(TEXT, $$) } source_cit_text_subs @@ -3132,9 +3348,10 @@ source_cit_text_sub : continuation_sub ; source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item - { $$ = start_element(ELT_SUB_SOUR_QUAY, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { $$ + = start_element(ELT_SUB_SOUR_QUAY, + PARENT, $1, $3, $4, + GEDCOM_MAKE_STRING(val1, $4)); START(QUAY, $$) } no_std_subs @@ -3148,7 +3365,7 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item { $$ = start_element(ELT_SUB_SOUR, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(SOUR, $$) } source_cit_emb_subs @@ -3173,9 +3390,13 @@ source_repos_cit_sub : source_repos_repo_sect { OCCUR2(REPO, 0, 1) } ; source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer - { $$ = start_element(ELT_SUB_REPO, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr + = gedcom_parse_xref($4, XREF_USED, XREF_REPO); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_REPO, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(REPO, $$) } source_repos_repo_subs @@ -3197,7 +3418,7 @@ source_repos_repo_sub : note_struc_sub caln_sect : OPEN DELIM TAG_CALN mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(CALN, $$) } caln_subs @@ -3218,7 +3439,7 @@ caln_sub : caln_medi_sect { OCCUR2(MEDI, 0, 1) } caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item { $$ = start_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + GEDCOM_MAKE_STRING(val1, $4)); START(MEDI, $$) } no_std_subs @@ -3233,9 +3454,13 @@ spou_fam_link_sub : spou_fam_fams_sect /* 0:M */ ; spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer - { $$ = start_element(ELT_SUB_FAMS, - PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING($4)); + { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED, + XREF_FAM); + if (xr == NULL) HANDLE_ERROR; + $$ + = start_element(ELT_SUB_FAMS, + PARENT, $1, $3, $4, + GEDCOM_MAKE_XREF_PTR(val1, xr)); START(FAMS, $$) } spou_fam_fams_subs @@ -3271,15 +3496,23 @@ no_std_rec : user_rec /* 0:M */ | error error_subs CLOSE { HANDLE_ERROR } ; -user_rec : OPEN DELIM opt_xref USERTAG - { if ($4[0] != '_') { +user_rec : OPEN DELIM opt_xref USERTAG + { if ($4.string[0] != '_') { gedcom_error(_("Undefined tag (and not a valid user tag): %s"), $4); YYERROR; } } opt_value - { $$ = start_record(REC_USER, $1, $3, $4); + { struct xref_value *xr = NULL; + if ($3 != NULL) { + xr = gedcom_parse_xref($3, XREF_DEFINED, XREF_USER); + if (xr == NULL) HANDLE_ERROR; + } + $$ = start_record(REC_USER, + $1, + GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr), + $4, $6, &val2); START($4, $$) } user_sects @@ -3287,16 +3520,15 @@ user_rec : OPEN DELIM opt_xref USERTAG CLOSE { end_record(REC_USER, $7); } ; -user_sect : OPEN DELIM opt_xref USERTAG - { if ($4[0] != '_') { +user_sect : OPEN DELIM opt_xref USERTAG + { if ($4.string[0] != '_') { gedcom_error(_("Undefined tag (and not a valid user tag): %s"), $4); YYERROR; } } opt_value - { $$ = start_element(ELT_USER, PARENT, $1, $4, $6, - GEDCOM_MAKE_NULL_OR_STRING($6)); + { $$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2); START($4, $$); } user_sects @@ -3314,12 +3546,15 @@ opt_xref : /* empty */ { $$ = NULL; } | POINTER DELIM { $$ = $1; } ; -opt_value : /* empty */ { $$ = NULL; } - | DELIM line_value { $$ = $2; } - ; - -line_value : POINTER { $$ = $1; } - | line_item { $$ = $1; } +opt_value : /* empty */ { GEDCOM_MAKE_NULL(val2); + $$ = NULL; } + | DELIM POINTER { struct xref_value *xr + = gedcom_parse_xref($2, XREF_USED, + XREF_USER); + GEDCOM_MAKE_XREF_PTR(val2, xr); + $$ = $2; } + | DELIM line_item { GEDCOM_MAKE_STRING(val2, $2); + $$ = $2; } ; mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; } @@ -3327,13 +3562,23 @@ 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_LIFELINES)) { + /* 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; } ; -opt_line_item : /* empty */ { } - | DELIM line_item { } +opt_line_item : /* empty */ { $$ = NULL; } + | DELIM line_item { gedcom_debug_print("==Val: %s==", $2); + $$ = $2; } ; line_item : anychar { size_t i; @@ -3383,7 +3628,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); } + { INVALID_TAG($4.string); } opt_value opt_sects CLOSE { } ; @@ -3393,7 +3638,7 @@ gen_rec : gen_rec_top ; gen_rec_norm : OPEN DELIM opt_xref anystdtag - { INVALID_TOP_TAG($4) } + { INVALID_TOP_TAG($4.string) } opt_value opt_sects CLOSE { } ; @@ -3579,22 +3824,22 @@ void push_countarray() void set_parenttag(char* tag) { - strncpy(tag_stack[count_level], tag, MAXSTDTAGLEN+1); + strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1); } void set_parentctxt(Gedcom_ctxt ctxt) { - ctxt_stack[count_level] = ctxt; + ctxt_stack[count_level+1] = ctxt; } -char* get_parenttag() +char* get_parenttag(int offset) { - return tag_stack[count_level]; + return tag_stack[count_level - offset]; } -Gedcom_ctxt get_parentctxt() +Gedcom_ctxt get_parentctxt(int offset) { - return ctxt_stack[count_level]; + return ctxt_stack[count_level - offset]; } int count_tag(int tag) @@ -3678,6 +3923,12 @@ void set_compatibility(char* program) gedcom_warning(_("Enabling compatibility with 'ftree'")); compatibility = C_FTREE; } + else if (! strncmp(program, "LIFELINES", 9)) { + /* Matches "LIFELINES 3.0.2" */ + gedcom_warning(_("Enabling compatibility with 'Lifelines'")); + compatibility = C_LIFELINES; + compat_at = 1; + } else { compatibility = 0; }