X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;ds=sidebyside;f=gedcom%2Fgedcom.y;h=8159d81a4d63ff7270ec5b4502a926562760a445;hb=eb7aad6ad3d76aded3774b40378f8d8a92aee3e5;hp=f305257db49f2f0f6e59a7c1db9c17c4347036ca;hpb=5962cdcec2493fc473f86aa6077d4b420c406112;p=gedcom-parse.git diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index f305257..8159d81 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -146,6 +146,7 @@ #include "encoding.h" #include "interface.h" #include "date.h" +#include "age.h" #include "xref.h" #include "compat.h" @@ -2241,10 +2242,11 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item } ; 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)); + GEDCOM_MAKE_AGE(val1, age)); START(AGE, $$) } no_std_subs @@ -2347,9 +2349,10 @@ 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)); + GEDCOM_MAKE_AGE(val1, age)); START(AGE, $$) } no_std_subs