X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=a0481851dd4aa3e0e1ba5a2737c6f88d402744f3;hb=4fe12100984a41d439dc9b4138d6cd8df36285f8;hp=872be1271cf9eec23b6adb96334dad6ec01814b1;hpb=e33cdc26ace551aae08fcd71a9f0d460c89b789d;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 872be12..a048185 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 <Peter.Verthez@advalvas.be>, 2001.
 
@@ -188,13 +188,19 @@ 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                                                              \
+#define START(PARENTTAG,PARENTCTXT)                                           \
+     { START1(PARENTTAG);                                                     \
+       START2(PARENTCTXT);                                                    \
+     }
+#define PARENT                                                                \
      get_parentctxt()
 #define CHK(TAG)                                                              \
      { if (!check_occurrence(TAG_##TAG)) {                                    \
@@ -243,6 +249,7 @@ int  compat_mode(int flags);
 %union {
   int  number;
   char *string;
+  struct tag_struct tag;
   Gedcom_ctxt ctxt;
 }
 
@@ -256,139 +263,144 @@ int  compat_mode(int flags);
 %token <string> DELIM
 %token <string> ANYCHAR
 %token <string> POINTER
-%token <string> USERTAG
-%token <string> TAG_ABBR
-%token <string> TAG_ADDR
-%token <string> TAG_ADR1
-%token <string> TAG_ADR2
-%token <string> TAG_ADOP
-%token <string> TAG_AFN
-%token <string> TAG_AGE
-%token <string> TAG_AGNC
-%token <string> TAG_ALIA
-%token <string> TAG_ANCE
-%token <string> TAG_ANCI
-%token <string> TAG_ANUL
-%token <string> TAG_ASSO
-%token <string> TAG_AUTH
-%token <string> TAG_BAPL
-%token <string> TAG_BAPM
-%token <string> TAG_BARM
-%token <string> TAG_BASM
-%token <string> TAG_BIRT
-%token <string> TAG_BLES
-%token <string> TAG_BLOB
-%token <string> TAG_BURI
-%token <string> TAG_CALN
-%token <string> TAG_CAST
-%token <string> TAG_CAUS
-%token <string> TAG_CENS
-%token <string> TAG_CHAN
-%token <string> TAG_CHAR
-%token <string> TAG_CHIL
-%token <string> TAG_CHR
-%token <string> TAG_CHRA
-%token <string> TAG_CITY
-%token <string> TAG_CONC
-%token <string> TAG_CONF
-%token <string> TAG_CONL
-%token <string> TAG_CONT
-%token <string> TAG_COPR
-%token <string> TAG_CORP
-%token <string> TAG_CREM
-%token <string> TAG_CTRY
-%token <string> TAG_DATA
-%token <string> TAG_DATE
-%token <string> TAG_DEAT
-%token <string> TAG_DESC
-%token <string> TAG_DESI
-%token <string> TAG_DEST
-%token <string> TAG_DIV
-%token <string> TAG_DIVF
-%token <string> TAG_DSCR
-%token <string> TAG_EDUC
-%token <string> TAG_EMIG
-%token <string> TAG_ENDL
-%token <string> TAG_ENGA
-%token <string> TAG_EVEN
-%token <string> TAG_FAM
-%token <string> TAG_FAMC
-%token <string> TAG_FAMF
-%token <string> TAG_FAMS
-%token <string> TAG_FCOM
-%token <string> TAG_FILE
-%token <string> TAG_FORM
-%token <string> TAG_GEDC
-%token <string> TAG_GIVN
-%token <string> TAG_GRAD
-%token <string> TAG_HEAD
-%token <string> TAG_HUSB
-%token <string> TAG_IDNO
-%token <string> TAG_IMMI
-%token <string> TAG_INDI
-%token <string> TAG_LANG
-%token <string> TAG_LEGA
-%token <string> TAG_MARB
-%token <string> TAG_MARC
-%token <string> TAG_MARL
-%token <string> TAG_MARR
-%token <string> TAG_MARS
-%token <string> TAG_MEDI
-%token <string> TAG_NAME
-%token <string> TAG_NATI
-%token <string> TAG_NATU
-%token <string> TAG_NCHI
-%token <string> TAG_NICK
-%token <string> TAG_NMR
-%token <string> TAG_NOTE
-%token <string> TAG_NPFX
-%token <string> TAG_NSFX
-%token <string> TAG_OBJE
-%token <string> TAG_OCCU
-%token <string> TAG_ORDI
-%token <string> TAG_ORDN
-%token <string> TAG_PAGE
-%token <string> TAG_PEDI
-%token <string> TAG_PHON
-%token <string> TAG_PLAC
-%token <string> TAG_POST
-%token <string> TAG_PROB
-%token <string> TAG_PROP
-%token <string> TAG_PUBL
-%token <string> TAG_QUAY
-%token <string> TAG_REFN
-%token <string> TAG_RELA
-%token <string> TAG_RELI
-%token <string> TAG_REPO
-%token <string> TAG_RESI
-%token <string> TAG_RESN
-%token <string> TAG_RETI
-%token <string> TAG_RFN
-%token <string> TAG_RIN
-%token <string> TAG_ROLE
-%token <string> TAG_SEX
-%token <string> TAG_SLGC
-%token <string> TAG_SLGS
-%token <string> TAG_SOUR
-%token <string> TAG_SPFX
-%token <string> TAG_SSN
-%token <string> TAG_STAE
-%token <string> TAG_STAT
-%token <string> TAG_SUBM
-%token <string> TAG_SUBN
-%token <string> TAG_SURN
-%token <string> TAG_TEMP
-%token <string> TAG_TEXT
-%token <string> TAG_TIME
-%token <string> TAG_TITL
-%token <string> TAG_TRLR
-%token <string> TAG_TYPE
-%token <string> TAG_VERS
-%token <string> TAG_WIFE
-%token <string> TAG_WILL
-
-%type <string> anystdtag
-%type <string> anytoptag
+%token <tag> USERTAG
+%token <tag> TAG_ABBR
+%token <tag> TAG_ADDR
+%token <tag> TAG_ADR1
+%token <tag> TAG_ADR2
+%token <tag> TAG_ADOP
+%token <tag> TAG_AFN
+%token <tag> TAG_AGE
+%token <tag> TAG_AGNC
+%token <tag> TAG_ALIA
+%token <tag> TAG_ANCE
+%token <tag> TAG_ANCI
+%token <tag> TAG_ANUL
+%token <tag> TAG_ASSO
+%token <tag> TAG_AUTH
+%token <tag> TAG_BAPL
+%token <tag> TAG_BAPM
+%token <tag> TAG_BARM
+%token <tag> TAG_BASM
+%token <tag> TAG_BIRT
+%token <tag> TAG_BLES
+%token <tag> TAG_BLOB
+%token <tag> TAG_BURI
+%token <tag> TAG_CALN
+%token <tag> TAG_CAST
+%token <tag> TAG_CAUS
+%token <tag> TAG_CENS
+%token <tag> TAG_CHAN
+%token <tag> TAG_CHAR
+%token <tag> TAG_CHIL
+%token <tag> TAG_CHR
+%token <tag> TAG_CHRA
+%token <tag> TAG_CITY
+%token <tag> TAG_CONC
+%token <tag> TAG_CONF
+%token <tag> TAG_CONL
+%token <tag> TAG_CONT
+%token <tag> TAG_COPR
+%token <tag> TAG_CORP
+%token <tag> TAG_CREM
+%token <tag> TAG_CTRY
+%token <tag> TAG_DATA
+%token <tag> TAG_DATE
+%token <tag> TAG_DEAT
+%token <tag> TAG_DESC
+%token <tag> TAG_DESI
+%token <tag> TAG_DEST
+%token <tag> TAG_DIV
+%token <tag> TAG_DIVF
+%token <tag> TAG_DSCR
+%token <tag> TAG_EDUC
+%token <tag> TAG_EMIG
+%token <tag> TAG_ENDL
+%token <tag> TAG_ENGA
+%token <tag> TAG_EVEN
+%token <tag> TAG_FAM
+%token <tag> TAG_FAMC
+%token <tag> TAG_FAMF
+%token <tag> TAG_FAMS
+%token <tag> TAG_FCOM
+%token <tag> TAG_FILE
+%token <tag> TAG_FORM
+%token <tag> TAG_GEDC
+%token <tag> TAG_GIVN
+%token <tag> TAG_GRAD
+%token <tag> TAG_HEAD
+%token <tag> TAG_HUSB
+%token <tag> TAG_IDNO
+%token <tag> TAG_IMMI
+%token <tag> TAG_INDI
+%token <tag> TAG_LANG
+%token <tag> TAG_LEGA
+%token <tag> TAG_MARB
+%token <tag> TAG_MARC
+%token <tag> TAG_MARL
+%token <tag> TAG_MARR
+%token <tag> TAG_MARS
+%token <tag> TAG_MEDI
+%token <tag> TAG_NAME
+%token <tag> TAG_NATI
+%token <tag> TAG_NATU
+%token <tag> TAG_NCHI
+%token <tag> TAG_NICK
+%token <tag> TAG_NMR
+%token <tag> TAG_NOTE
+%token <tag> TAG_NPFX
+%token <tag> TAG_NSFX
+%token <tag> TAG_OBJE
+%token <tag> TAG_OCCU
+%token <tag> TAG_ORDI
+%token <tag> TAG_ORDN
+%token <tag> TAG_PAGE
+%token <tag> TAG_PEDI
+%token <tag> TAG_PHON
+%token <tag> TAG_PLAC
+%token <tag> TAG_POST
+%token <tag> TAG_PROB
+%token <tag> TAG_PROP
+%token <tag> TAG_PUBL
+%token <tag> TAG_QUAY
+%token <tag> TAG_REFN
+%token <tag> TAG_RELA
+%token <tag> TAG_RELI
+%token <tag> TAG_REPO
+%token <tag> TAG_RESI
+%token <tag> TAG_RESN
+%token <tag> TAG_RETI
+%token <tag> TAG_RFN
+%token <tag> TAG_RIN
+%token <tag> TAG_ROLE
+%token <tag> TAG_SEX
+%token <tag> TAG_SLGC
+%token <tag> TAG_SLGS
+%token <tag> TAG_SOUR
+%token <tag> TAG_SPFX
+%token <tag> TAG_SSN
+%token <tag> TAG_STAE
+%token <tag> TAG_STAT
+%token <tag> TAG_SUBM
+%token <tag> TAG_SUBN
+%token <tag> TAG_SURN
+%token <tag> TAG_TEMP
+%token <tag> TAG_TEXT
+%token <tag> TAG_TIME
+%token <tag> TAG_TITL
+%token <tag> TAG_TRLR
+%token <tag> TAG_TYPE
+%token <tag> TAG_VERS
+%token <tag> TAG_WIFE
+%token <tag> TAG_WILL
+
+%type <tag> anystdtag
+%type <tag> anytoptag
+%type <tag> fam_event_tag
+%type <tag> indiv_attr_tag
+%type <tag> indiv_birt_tag
+%type <tag> indiv_gen_tag
+%type <tag> lio_bapl_tag
 %type <string> line_item
 %type <string> line_value
 %type <string> mand_line_item
@@ -398,11 +410,6 @@ int  compat_mode(int flags);
 %type <string> opt_xref
 %type <string> opt_value
 %type <string> opt_line_item
-%type <string> fam_event_tag
-%type <string> indiv_attr_tag
-%type <string> indiv_birt_tag
-%type <string> indiv_gen_tag
-%type <string> lio_bapl_tag
 %type <ctxt> head_sect
 
 %%
@@ -430,7 +437,8 @@ record      : fam_rec
 /**** Header                                                      ****/
 /*********************************************************************/
 head_sect    : OPEN DELIM TAG_HEAD
-               { $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(), $3);
+               { $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(), $3,
+					 NULL, GEDCOM_MAKE_NULL());
 	         START(HEAD, $<ctxt>$) }
                head_subs
                { if (compat_mode(C_FTREE))
@@ -514,7 +522,7 @@ head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
                     ;
 head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item 
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_CORP, PARENT,
-						 $1, $3, $4, 
+						 $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 			START(CORP, $<ctxt>$)
 		      }
@@ -536,7 +544,7 @@ head_sour_corp_sub : addr_struc_sub  /* 0:1 */
 
 head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item 
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA, PARENT,
-						 $1, $3, $4, 
+						 $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 			START(DATA, $<ctxt>$)
 		      }
@@ -560,7 +568,7 @@ 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);
 			     $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_DATE,
-						      PARENT, $1, $3, $4, 
+						      PARENT, $1, $3, $4,
 						      GEDCOM_MAKE_DATE(dv));
 			     START(DATE, $<ctxt>$)
 			   }
@@ -573,7 +581,7 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                          ;
 head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
                            { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_COPR,
-						      PARENT, $1, $3, $4, 
+						      PARENT, $1, $3, $4,
 						      GEDCOM_MAKE_STRING($4));
 			     START(COPR, $<ctxt>$)
 			   }
@@ -588,7 +596,7 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
 /* HEAD.DEST */
 head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_DEST,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(DEST, $<ctxt>$)
 		 }
@@ -604,7 +612,7 @@ 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);
 		   $<ctxt>$ = start_element(ELT_HEAD_DATE,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_DATE(dv));
 		   START(DATE, $<ctxt>$)
 		 }
@@ -626,7 +634,7 @@ head_date_sub  : head_date_time_sect  { OCCUR2(TIME, 0, 1) }
 
 head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
                       { $<ctxt>$ = start_element(ELT_HEAD_DATE_TIME,
-						 PARENT, $1, $3, $4, 
+						 PARENT, $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 		        START(TIME, $<ctxt>$)
 		      }
@@ -641,7 +649,7 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
 /* HEAD.SUBM */
 head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
                  { $<ctxt>$ = start_element(ELT_HEAD_SUBM,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(SUBM, $<ctxt>$)
 		 }
@@ -655,7 +663,7 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 /* HEAD.SUBN */
 head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer 
                  { $<ctxt>$ = start_element(ELT_HEAD_SUBN,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(SUBN, $<ctxt>$)
 		 }
@@ -669,7 +677,7 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
 /* HEAD.FILE */
 head_file_sect : OPEN DELIM TAG_FILE mand_line_item 
                  { $<ctxt>$ = start_element(ELT_HEAD_FILE,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(FILE, $<ctxt>$)
 		 }
@@ -682,7 +690,7 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item
 /* HEAD.COPR */
 head_copr_sect : OPEN DELIM TAG_COPR mand_line_item 
                  { $<ctxt>$ = start_element(ELT_HEAD_COPR,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(COPR, $<ctxt>$)
 		 }
@@ -716,7 +724,7 @@ head_gedc_sub  : head_gedc_vers_sect  { OCCUR2(VERS, 1, 1) }
                ;
 head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item  
                       { $<ctxt>$ = start_element(ELT_HEAD_GEDC_VERS,
-						 PARENT, $1, $3, $4, 
+						 PARENT, $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 		        START(VERS, $<ctxt>$)
 		      }
@@ -729,7 +737,7 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
                     ;
 head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item   
                       { $<ctxt>$ = start_element(ELT_HEAD_GEDC_FORM,
-						 PARENT, $1, $3, $4, 
+						 PARENT, $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 		        START(FORM, $<ctxt>$)
 		      }
@@ -745,7 +753,7 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
 head_char_sect : OPEN DELIM TAG_CHAR mand_line_item 
                  { if (open_conv_to_internal($4) == 0) YYERROR;
 		   $<ctxt>$ = start_element(ELT_HEAD_CHAR,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(CHAR, $<ctxt>$)
 		 }
@@ -765,7 +773,7 @@ head_char_sub  : head_char_vers_sect  { OCCUR2(VERS, 0, 1) }
                ;
 head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item   
                       { $<ctxt>$ = start_element(ELT_HEAD_CHAR_VERS,
-						 PARENT, $1, $3, $4, 
+						 PARENT, $1, $3, $4,
 						 GEDCOM_MAKE_STRING($4));
 		        START(VERS, $<ctxt>$)
 		      }
@@ -780,7 +788,7 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
 /* HEAD.LANG */
 head_lang_sect : OPEN DELIM TAG_LANG mand_line_item   
                  { $<ctxt>$ = start_element(ELT_HEAD_LANG,
-					    PARENT, $1, $3, $4, 
+					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING($4));
 		   START(LANG, $<ctxt>$)
 		 }
@@ -859,7 +867,8 @@ trlr_sect   : OPEN DELIM TAG_TRLR CLOSE { }
 /*********************************************************************/
 fam_rec      : OPEN DELIM POINTER DELIM TAG_FAM
                { $<ctxt>$ = start_record(REC_FAM,
-					 $1, GEDCOM_MAKE_STRING($3), $5);
+					 $1, GEDCOM_MAKE_STRING($3), $5,
+					 NULL, GEDCOM_MAKE_NULL());
 		 START(FAM, $<ctxt>$) }
                fam_subs
 	       { CHECK0 }
@@ -961,7 +970,8 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 /*********************************************************************/
 indiv_rec   : OPEN DELIM POINTER DELIM TAG_INDI
               { $<ctxt>$ = start_record(REC_INDI,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					NULL, GEDCOM_MAKE_NULL());
 		START(INDI, $<ctxt>$) }
               indi_subs
 	      { CHECK0 }
@@ -1120,7 +1130,8 @@ ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
 /*********************************************************************/
 multim_rec  : OPEN DELIM POINTER DELIM TAG_OBJE
               { $<ctxt>$ = start_record(REC_OBJE,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					NULL, GEDCOM_MAKE_NULL());
 		START(OBJE, $<ctxt>$) }
               obje_subs
 	      { CHECK2(FORM, BLOB) }
@@ -1225,12 +1236,13 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
 /*********************************************************************/
 note_rec    : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
               { $<ctxt>$ = start_record(REC_NOTE,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					$6, GEDCOM_MAKE_STRING($6));
 		START(NOTE, $<ctxt>$) }
               note_subs
 	      { CHECK0 }
               CLOSE
-              { end_record(REC_NOTE, $<ctxt>6); }
+              { end_record(REC_NOTE, $<ctxt>7); }
             ;
 
 note_line_item : /* empty */
@@ -1259,7 +1271,8 @@ note_sub    : continuation_sub  /* 0:M */
 /*********************************************************************/
 repos_rec   : OPEN DELIM POINTER DELIM TAG_REPO
               { $<ctxt>$ = start_record(REC_REPO,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					NULL, GEDCOM_MAKE_NULL());
 		START(REPO, $<ctxt>$) }
               repo_subs
 	      { CHECK0 }
@@ -1298,7 +1311,8 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
 /*********************************************************************/
 source_rec  : OPEN DELIM POINTER DELIM TAG_SOUR
               { $<ctxt>$ = start_record(REC_SOUR,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					NULL, GEDCOM_MAKE_NULL());
 		START(SOUR, $<ctxt>$) }
               sour_subs
 	      { CHECK0 }
@@ -1521,7 +1535,8 @@ sour_text_sub  : continuation_sub  /* 0:M */
 /*********************************************************************/
 submis_rec  : OPEN DELIM POINTER DELIM TAG_SUBN    
               { $<ctxt>$ = start_record(REC_SUBN,
-					$1, GEDCOM_MAKE_STRING($3), $5);
+					$1, GEDCOM_MAKE_STRING($3), $5,
+					NULL, GEDCOM_MAKE_NULL());
 		START(SUBN, $<ctxt>$) }
               subn_subs
 	      { CHECK0 }
@@ -1646,7 +1661,8 @@ subn_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
 /*********************************************************************/
 submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM    
              { $<ctxt>$ = start_record(REC_SUBM,
-				       $1, GEDCOM_MAKE_STRING($3), $5);
+				       $1, GEDCOM_MAKE_STRING($3), $5,
+				       NULL, GEDCOM_MAKE_NULL());
 		START(SUBM, $<ctxt>$) }
              subm_subs
 	     { CHECK1(NAME) }
@@ -2132,8 +2148,7 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value
 		   $<ctxt>$ = 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($<ctxt>$);
+		   START2($<ctxt>$);
 		 }
                  fam_event_subs
                  { CHECK0 }
@@ -2142,16 +2157,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 */
@@ -2302,8 +2317,7 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_ATTR,
 					     PARENT, $1, $3, $4,
 					     GEDCOM_MAKE_STRING($4));
-		    /* set the parent context separately from START here */
-		    set_parentctxt($<ctxt>$);
+		    START2($<ctxt>$);
 		  }
                   indiv_attr_event_subs
                   { CHECK0 }
@@ -2311,18 +2325,18 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
                   { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>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 
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_RESI,
@@ -2356,8 +2370,7 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value
                   { $<ctxt>$ = 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($<ctxt>$);
+		    START2($<ctxt>$);
 		  }
                   indiv_birt_subs
                   { CHECK0 }
@@ -2366,8 +2379,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 */
@@ -2397,8 +2410,7 @@ indiv_gen_sect  : OPEN DELIM indiv_gen_tag opt_value
                   { $<ctxt>$ = 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($<ctxt>$);
+		    START2($<ctxt>$);
 		  }
                   indiv_gen_subs
                   { CHECK0 }
@@ -2407,25 +2419,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 */
@@ -2513,8 +2525,7 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag
                 { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL,
 					   PARENT, $1, $3, NULL,
 					   GEDCOM_MAKE_NULL());
-		  /* set the parent context separately from START here */
-		  set_parentctxt($<ctxt>$);
+		  START2($<ctxt>$);
 		}
                 lio_bapl_subs
                 { CHECK0 }
@@ -2523,9 +2534,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 */
@@ -3279,8 +3290,8 @@ 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;
@@ -3288,7 +3299,8 @@ user_rec    : OPEN DELIM opt_xref USERTAG
 	      }
               opt_value
               { $<ctxt>$ = start_record(REC_USER,
-					$1, GEDCOM_MAKE_STRING($3), $4);
+					$1, GEDCOM_MAKE_NULL_OR_STRING($3), $4,
+					$6, GEDCOM_MAKE_NULL_OR_STRING($6));
 	        START($4, $<ctxt>$)
 	      }
 	      user_sects
@@ -3296,8 +3308,8 @@ user_rec    : OPEN DELIM opt_xref USERTAG
 	      CLOSE
               { end_record(REC_USER, $<ctxt>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;
@@ -3342,7 +3354,8 @@ mand_line_item : /* empty */ { gedcom_error(_("Missing value")); YYERROR; }
                ;
 
 opt_line_item : /* empty */ { }
-              | DELIM line_item { }
+              | DELIM line_item { gedcom_debug_print("==Val: %s==", $2);
+	                          $$ = $2; }
               ;
 
 line_item   : anychar  { size_t i;
@@ -3588,12 +3601,12 @@ 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()