X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=f6d281e0811eeea3ae84323d71476920a279486a;hb=3d1822cb295202993c11564f7dd64442d8b67d2f;hp=2b52293d16d84b0c3b2f2a6b8409e51a794ad523;hpb=f9bc091fb22cfd09794c6bd9ef64094a438c76be;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 2b52293..f6d281e 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -178,7 +178,7 @@ 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 HANDLE_ERROR                                                          \
      { if (error_mechanism == IMMED_FAIL) {                                   \
@@ -1234,6 +1234,8 @@ indi_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
 			= start_element(ELT_SUB_ADDR,
 					par, $1 + 1, $3, $4,
 					GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
+		      reset_buffer(&concat_buffer);
+		      safe_buf_append(&concat_buffer, $4);
 		      START(ADDR, $1 + 1, $<ctxt>$);
 		    }
 		  else { START(ADDR, $1, NULL) }
@@ -1243,8 +1245,9 @@ indi_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
                   CLOSE
                   { if (compat_mode(C_INDI_ADDR)) {
 		      Gedcom_ctxt par = PARENT;
+		      char* complete = get_buf_string(&concat_buffer);
 		      end_element(ELT_SUB_ADDR, par, $<ctxt>5,
-				  GEDCOM_MAKE_NULL(val1));
+				  GEDCOM_MAKE_STRING(val1, complete));
 		      CHECK0;
 		      compat_generate_resi_end(PARENT, par);
 		    } 
@@ -1420,7 +1423,7 @@ note_line_item : /* empty */
 		       gedcom_error(_("Missing value")); YYERROR;
 		     }
 		     else {
-		       $$ = "";
+		       $$ = VALUE_IF_MISSING;
 		     }
 		   }
                | DELIM line_item
@@ -2278,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 
             { $<ctxt>$ = start_element(ELT_SUB_CONT,
 				       PARENT, $1, $3, $4, 
-				       GEDCOM_MAKE_STRING(val1, $4));
+				       GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
 	      SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
-	      safe_buf_append(&concat_buffer, $4);
+	      if (GEDCOM_IS_STRING(&val1))
+	        safe_buf_append(&concat_buffer, $4);
 	      START(CONT, $1, $<ctxt>$)  
             }  
             no_std_subs  
@@ -3741,7 +3745,7 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; }
 mand_line_item : /* empty */
                  { if (compat_mode(C_NO_REQUIRED_VALUES)) {
                      gedcom_debug_print("==Val: ==");
-		     $$ = "";
+		     $$ = VALUE_IF_MISSING;
 		   }
 		   else {
 		     gedcom_error(_("Missing value")); YYERROR;