From a9ef3e45e68f855ec594bd5f1fa5e25618a706fd Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Tue, 22 Jan 2002 20:20:21 +0000
Subject: [PATCH 1/1] Some enhancements in the ftree compatibility.

---
 gedcom/gedcom.y | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index ed3f303..10486da 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -257,7 +257,7 @@ int  compat_mode(int flags);
 }
 
 %token_table
-%expect 300
+%expect 303
 
 %token <string> BADTOKEN
 %token <number> OPEN
@@ -1172,23 +1172,37 @@ 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
-                  { Gedcom_ctxt par = compat_generate_resi_start(PARENT);
-		    START(RESI, par);
-		    $<ctxt>$
-		      = start_element(ELT_SUB_ADDR,
-				      par, $1 + 1, $3, $4,
-				      GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
-		    START(ADDR, $<ctxt>$)
+                  { if (compat_mode(C_FTREE)) {
+		      Gedcom_ctxt par = compat_generate_resi_start(PARENT);
+		      START(RESI, par);
+		      $<ctxt>$
+			= start_element(ELT_SUB_ADDR,
+					par, $1 + 1, $3, $4,
+					GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
+		      START(ADDR, $<ctxt>$);
+		    }
+		  else { START(ADDR, NULL) }
 		  }
-                  no_std_subs
+                  ftree_addr_subs
                   { CHECK0 }
                   CLOSE
-                  { Gedcom_ctxt par = PARENT;
-		    end_element(ELT_SUB_ADDR, par, $<ctxt>5, NULL);
-		    CHECK0;
-		    compat_generate_resi_end(PARENT, par);
+                  { if (compat_mode(C_FTREE)) {
+		      Gedcom_ctxt par = PARENT;
+		      end_element(ELT_SUB_ADDR, par, $<ctxt>5, NULL);
+		      CHECK0;
+		      compat_generate_resi_end(PARENT, par);
+		    } 
 		  }
 
+ftree_addr_subs : /* empty */
+                | ftree_addr_subs ftree_addr_sub
+                ;
+
+ftree_addr_sub  : continuation_sub
+                | phon_sect
+                | no_std_sub
+                ;
+
 /*********************************************************************/
 /**** Multimedia record                                           ****/
 /*********************************************************************/
-- 
2.30.2