X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=f6d281e0811eeea3ae84323d71476920a279486a;hb=3d1822cb295202993c11564f7dd64442d8b67d2f;hp=395db23646f78b877c851977832f9e86ad3a25f3;hpb=3fae12a186ba47a970bea1bb2b5ce720f596a26b;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index 395db23..f6d281e 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -157,13 +157,18 @@ int gedcom_high_level_debug = 0; Gedcom_err_mech error_mechanism = IMMED_FAIL; Gedcom_val_struct val1; Gedcom_val_struct val2; - -char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1]; -char *line_item_buf_ptr; + +void cleanup_line_item_buffer(); +struct safe_buffer line_item_buffer = { NULL, 0, NULL, 0, + cleanup_line_item_buffer }; void cleanup_concat_buffer(); -struct safe_buffer concat_buffer = { NULL, 0, cleanup_concat_buffer }; +struct safe_buffer concat_buffer = { NULL, 0, NULL, 0, cleanup_concat_buffer }; +void cleanup_usertag_buffer(); +struct safe_buffer usertag_buffer = { NULL, 0, NULL, 0, + cleanup_usertag_buffer}; + /* These are defined at the bottom of the file */ void push_countarray(int level); void set_parenttag(const char* tag); @@ -173,11 +178,8 @@ Gedcom_ctxt get_parentctxt(int offset); void pop_countarray(); int count_tag(int tag); int check_occurrence(int tag); -void clean_up(); +void clean_up(); -#define CLEAR_BUFFER(BUF) \ - memset(BUF, 0, sizeof(BUF)); - #define HANDLE_ERROR \ { if (error_mechanism == IMMED_FAIL) { \ clean_up(); YYABORT; \ @@ -212,7 +214,9 @@ void clean_up(); #TAG, parenttag); \ HANDLE_ERROR; \ } \ - } + } +#define CHK_COND(TAG) \ + check_occurrence(TAG_##TAG) #define POP \ { pop_countarray(); \ --count_level; \ @@ -446,22 +450,24 @@ head_sect : OPEN DELIM TAG_HEAD NULL, GEDCOM_MAKE_NULL(val2)); START(HEAD, $1, $$) } head_subs - { if (compat_mode(C_FTREE)) { - CHECK3(SOUR, GEDC, CHAR); - compat_generate_submitter_link($4); - } - else if (compat_mode(C_LIFELINES)) { - CHECK1(SOUR); + { if (compat_mode(C_NO_SUBMITTER) && ! CHK_COND(SUBM)) compat_generate_submitter_link($4); + else CHK(SUBM); + + if (compat_mode(C_NO_GEDC) && ! CHK_COND(GEDC)) compat_generate_gedcom($4); + else CHK(GEDC); + + if (compat_mode(C_NO_CHAR) && ! CHK_COND(CHAR)) { if (compat_generate_char($4)) HANDLE_ERROR; - } - else - CHECK4(SOUR, SUBM, GEDC, CHAR) + } + else CHK(CHAR); + + CHECK1(SOUR); } CLOSE { end_record(REC_HEAD, $4, GEDCOM_MAKE_NULL(val1)); - if (compat_mode(C_FTREE | C_LIFELINES)) + if (compat_mode(C_NO_SUBMITTER)) compat_generate_submitter(); } ; @@ -473,7 +479,7 @@ head_subs : /* empty */ head_sub : head_sour_sect { OCCUR2(SOUR, 1, 1) } | head_dest_sect { OCCUR2(DEST, 0, 1) } | head_date_sect { OCCUR2(DATE, 0, 1) } - | head_time_sect { if (!compat_mode(C_LIFELINES)) + | head_time_sect { if (!compat_mode(C_HEAD_TIME)) INVALID_TAG("TIME"); OCCUR2(TIME, 0, 1) } | head_subm_sect { OCCUR2(SUBM, 1, 1) } @@ -490,7 +496,7 @@ head_sub : head_sour_sect { OCCUR2(SOUR, 1, 1) } /* HEAD.SOUR */ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item - { set_compatibility($4); + { set_compatibility_program($4); $$ = start_element(ELT_HEAD_SOUR, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); @@ -499,7 +505,8 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item head_sour_subs { CHECK0 } CLOSE - { end_element(ELT_HEAD_SOUR, PARENT, $5, + { compute_compatibility(); + end_element(ELT_HEAD_SOUR, PARENT, $5, GEDCOM_MAKE_NULL(val1)); } ; @@ -515,7 +522,8 @@ head_sour_sub : head_sour_vers_sect { OCCUR2(VERS, 0, 1) } ; head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item - { $$ = start_element(ELT_HEAD_SOUR_VERS, PARENT, + { set_compatibility_version($4); + $$ = start_element(ELT_HEAD_SOUR_VERS, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); START(VERS, $1, $$) @@ -670,7 +678,7 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item } ; -/* HEAD.TIME (Only for 'Lifelines' compatibility) */ +/* HEAD.TIME (Only for 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")); @@ -1049,7 +1057,10 @@ indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI indi_subs { CHECK0 } CLOSE - { end_record(REC_INDI, $6, GEDCOM_MAKE_NULL(val1)); } + { end_record(REC_INDI, $6, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_NO_SLGC_FAMC)) + compat_generate_slgc_famc_fam(); + } ; indi_subs : /* empty */ @@ -1076,7 +1087,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 @@ -1214,26 +1225,29 @@ 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 - { if (compat_mode(C_FTREE)) { +/* INDI.ADDR (Only for compatibility) */ +indi_addr_sect : OPEN DELIM TAG_ADDR opt_line_item + { if (compat_mode(C_INDI_ADDR)) { Gedcom_ctxt par = compat_generate_resi_start(PARENT); START(RESI, $1, par); $$ = start_element(ELT_SUB_ADDR, par, $1 + 1, $3, $4, GEDCOM_MAKE_NULL_OR_STRING(val2, $4)); - START(ADDR, $1, $$); + reset_buffer(&concat_buffer); + safe_buf_append(&concat_buffer, $4); + START(ADDR, $1 + 1, $$); } else { START(ADDR, $1, NULL) } } ftree_addr_subs { CHECK0 } CLOSE - { if (compat_mode(C_FTREE)) { + { if (compat_mode(C_INDI_ADDR)) { Gedcom_ctxt par = PARENT; + char* complete = get_buf_string(&concat_buffer); end_element(ELT_SUB_ADDR, par, $5, - GEDCOM_MAKE_NULL(val1)); + GEDCOM_MAKE_STRING(val1, complete)); CHECK0; compat_generate_resi_end(PARENT, par); } @@ -1331,7 +1345,6 @@ obje_blob_sect : OPEN DELIM TAG_BLOB PARENT, $1, $3, NULL, GEDCOM_MAKE_NULL(val1)); reset_buffer(&concat_buffer); - safe_buf_append(&concat_buffer, ""); START(BLOB, $1, $$) } obje_blob_subs @@ -1406,11 +1419,11 @@ note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item ; note_line_item : /* empty */ - { if (!compat_mode(C_FTREE)) { + { if (!compat_mode(C_NOTE_NO_VALUE)) { gedcom_error(_("Missing value")); YYERROR; } else { - $$ = ""; + $$ = VALUE_IF_MISSING; } } | DELIM line_item @@ -1994,7 +2007,7 @@ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item { $$ = start_element(ELT_SUB_ADDR_CONT, PARENT, $1, $3, $4, GEDCOM_MAKE_STRING(val1, $4)); - safe_buf_append(&concat_buffer, "\n"); + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); safe_buf_append(&concat_buffer, $4); START(CONT, $1, $$) } @@ -2268,12 +2281,13 @@ continuation_sub : cont_sect /* 0:M */ | conc_sect /* 0:M */ ; -cont_sect : OPEN DELIM TAG_CONT mand_line_item +cont_sect : OPEN DELIM TAG_CONT opt_line_item { $$ = start_element(ELT_SUB_CONT, PARENT, $1, $3, $4, - GEDCOM_MAKE_STRING(val1, $4)); - safe_buf_append(&concat_buffer, "\n"); - safe_buf_append(&concat_buffer, $4); + GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + SAFE_BUF_ADDCHAR(&concat_buffer, '\n'); + if (GEDCOM_IS_STRING(&val1)) + safe_buf_append(&concat_buffer, $4); START(CONT, $1, $$) } no_std_subs @@ -2886,7 +2900,11 @@ lio_slgc_sect : OPEN DELIM TAG_SLGC START(SLGC, $1, $$) } lio_slgc_subs - { CHECK1(FAMC) } + { if (compat_mode(C_NO_SLGC_FAMC) && ! CHK_COND(FAMC)) + compat_generate_slgc_famc_link($4); + else CHK(FAMC); + CHECK0; + } CLOSE { end_element(ELT_SUB_LIO_SLGC, PARENT, $4, GEDCOM_MAKE_NULL(val1)); @@ -3632,9 +3650,15 @@ no_std_rec : user_rec /* 0:M */ user_rec : OPEN DELIM opt_xref USERTAG { if ($4.string[0] != '_') { - gedcom_error(_("Undefined tag (and not a valid user tag): %s"), - $4); - YYERROR; + if (compat_mode(C_551_TAGS) + && compat_check_551_tag($4.string, &usertag_buffer)) { + $4.string = get_buf_string(&usertag_buffer); + } + else { + gedcom_error(_("Undefined tag (and not a valid user tag): %s"), + $4); + YYERROR; + } } } opt_value @@ -3656,9 +3680,20 @@ user_rec : OPEN DELIM opt_xref USERTAG ; user_sect : OPEN DELIM opt_xref USERTAG { if ($4.string[0] != '_') { - gedcom_error(_("Undefined tag (and not a valid user tag): %s"), - $4); - YYERROR; + if (compat_mode(C_551_TAGS) + && compat_check_551_tag($4.string, &usertag_buffer)) { + $4.string = get_buf_string(&usertag_buffer); + } + else if (compat_mode(C_SUBM_COMM) && + compat_check_subm_comm($4.string, get_parenttag(0), + &usertag_buffer)) { + $4.string = get_buf_string(&usertag_buffer); + } + else { + gedcom_error(_("Undefined tag (and not a valid user tag): %s"), + $4); + YYERROR; + } } } opt_value @@ -3670,11 +3705,21 @@ user_sect : OPEN DELIM opt_xref USERTAG CLOSE { end_element(ELT_USER, PARENT, $7, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_SUBM_COMM)) + compat_close_subm_comm(); } ; user_sects : /* empty */ { } | user_sects user_sect { } + | user_sects gen_sect + { if (compat_mode(C_SUBM_COMM)) { + } + else { + gedcom_error(_("Standard tag not allowed in user section")); + YYERROR; + } + } ; opt_xref : /* empty */ { $$ = NULL; } @@ -3698,10 +3743,9 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; } ; mand_line_item : /* empty */ - { if (compat_mode(C_LIFELINES)) { - /* Lifelines tends to not care about mandatory values */ - gedcom_debug_print("==Val: =="); - $$ = ""; + { if (compat_mode(C_NO_REQUIRED_VALUES)) { + gedcom_debug_print("==Val: =="); + $$ = VALUE_IF_MISSING; } else { gedcom_error(_("Missing value")); YYERROR; @@ -3717,38 +3761,36 @@ opt_line_item : /* empty */ { $$ = NULL; } ; line_item : anychar { size_t i; - CLEAR_BUFFER(line_item_buf); - line_item_buf_ptr = line_item_buf; - /* The following also takes care of '@@' */ + reset_buffer(&line_item_buffer); + /* The following also takes care of '@@' */ if (!strncmp($1, "@@", 3)) - *line_item_buf_ptr++ = '@'; + SAFE_BUF_ADDCHAR(&line_item_buffer, '@') else for (i=0; i < strlen($1); i++) - *line_item_buf_ptr++ = $1[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i]) + $$ = get_buf_string(&line_item_buffer); } | ESCAPE { size_t i; - CLEAR_BUFFER(line_item_buf); - line_item_buf_ptr = line_item_buf; - for (i=0; i < strlen($1); i++) - *line_item_buf_ptr++ = $1[i]; - $$ = line_item_buf; + reset_buffer(&line_item_buffer); + for (i=0; i < strlen($1); i++) + SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i]) + $$ = get_buf_string(&line_item_buffer); } | line_item anychar { size_t i; /* The following also takes care of '@@' */ if (!strncmp($2, "@@", 3)) - *line_item_buf_ptr++ = '@'; + SAFE_BUF_ADDCHAR(&line_item_buffer, '@') else for (i=0; i < strlen($2); i++) - *line_item_buf_ptr++ = $2[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i]) + $$ = get_buf_string(&line_item_buffer); } | line_item ESCAPE { size_t i; for (i=0; i < strlen($2); i++) - *line_item_buf_ptr++ = $2[i]; - $$ = line_item_buf; + SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i]) + $$ = get_buf_string(&line_item_buffer); } | line_item error anychar { HANDLE_ERROR; } | line_item error ESCAPE { HANDLE_ERROR; } @@ -3766,9 +3808,23 @@ error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { } ; gen_sect : OPEN DELIM opt_xref anystdtag - { INVALID_TAG($4.string); } - opt_value opt_sects CLOSE - { } + { if (compat_mode(C_SUBM_COMM) + && compat_check_subm_comm_cont($4.string)) { + /* Will pass here */ + } + else { + INVALID_TAG($4.string); + } + } + opt_value + { if (compat_mode(C_SUBM_COMM)) { + $$ = compat_subm_comm_cont_start(PARENT, $6); + } + } + opt_sects CLOSE + { if (compat_mode(C_SUBM_COMM)) + compat_subm_comm_cont_end(PARENT, $7); + } ; gen_rec : gen_rec_top @@ -3945,7 +4001,7 @@ Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1]; void push_countarray(int level) { int *count = NULL; - gedcom_debug_print("Push Count level: %d, level: %d\n", count_level, level); + gedcom_debug_print("Push Count level: %d, level: %d", count_level, level); if (count_level != level + 1) { gedcom_error(_("Internal error: count level mismatch")); exit(1); @@ -3955,7 +4011,7 @@ void push_countarray(int level) exit(1); } else { - gedcom_debug_print("calloc countarray %d\n", count_level); + gedcom_debug_print("calloc countarray %d", count_level); count = (int *)calloc(YYNTOKENS, sizeof(int)); if (count == NULL) { gedcom_error(_("Internal error: count array calloc error")); @@ -4002,14 +4058,14 @@ int check_occurrence(int tag) void pop_countarray() { int *count; - gedcom_debug_print("Pop Count level: %d\n", count_level); + gedcom_debug_print("Pop Count level: %d", count_level); if (count_level < 0) { gedcom_error(_("Internal error: count array underflow")); exit(1); } else { count = count_arrays[count_level]; - gedcom_debug_print("free countarray %d\n", count_level); + gedcom_debug_print("free countarray %d", count_level); free(count); count_arrays[count_level] = NULL; } @@ -4017,7 +4073,7 @@ void pop_countarray() void clean_up() { - gedcom_debug_print("Cleanup countarrays\n"); + gedcom_debug_print("Cleanup countarrays"); while (count_level > 0) { pop_countarray(); --count_level; @@ -4029,6 +4085,16 @@ void cleanup_concat_buffer() cleanup_buffer(&concat_buffer); } +void cleanup_line_item_buffer() +{ + cleanup_buffer(&line_item_buffer); +} + +void cleanup_usertag_buffer() +{ + cleanup_buffer(&usertag_buffer); +} + /* Enabling debug mode */ /* level 0: no debugging */ /* level 1: only internal */