X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=43811029a08739c5864e784fd103ae741cf3856f;hb=617db8c6fc5e647c2daf45754a98f6792c15db03;hp=911b5fdf85b0a049002b59bc80de634792efe2f1;hpb=0a9103e26559e1501b6cf7dd7f8eb00ba50de1cb;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 911b5fd..4381102 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -146,14 +146,13 @@
 #include "encoding.h"
 #include "interface.h"
 #include "date.h"
+#include "age.h"
 #include "xref.h"
 #include "compat.h"
 
 int  count_level    = 0;
 int  fail           = 0;
-int  compat_enabled = 1;
 int  gedcom_high_level_debug = 0; 
-int  compatibility  = 0; 
 Gedcom_err_mech error_mechanism = IMMED_FAIL;
 Gedcom_val_struct val1;
 Gedcom_val_struct val2; 
@@ -161,22 +160,15 @@ Gedcom_val_struct val2;
 char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
 char *line_item_buf_ptr;
 
-enum _COMPAT {
-  C_FTREE = 0x01,
-  C_LIFELINES = 0x02
-};
-
 /* These are defined at the bottom of the file */ 
 void push_countarray();
-void set_parenttag(char* tag);
+void set_parenttag(const char* tag);
 char* get_parenttag(int offset); 
 void set_parentctxt(Gedcom_ctxt ctxt);
 Gedcom_ctxt get_parentctxt(int offset);
 void pop_countarray();
 int  count_tag(int tag);
 int  check_occurrence(int tag);
-void set_compatibility(char* program);
-int  compat_mode(int flags); 
 
 #define CLEAR_BUFFER(BUF)                                                     \
      memset(BUF, 0, sizeof(BUF));
@@ -672,9 +664,9 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
 
 /* HEAD.TIME (Only for 'Lifelines' compatibility) */
 /* Just ignore the time... */
-head_time_sect : OPEN DELIM TAG_TIME opt_line_item
-                 { }
-                 CLOSE
+head_time_sect : OPEN DELIM TAG_TIME opt_line_item CLOSE
+                 { gedcom_warning(_("Header change time lost in the compatibility"));
+                 }
 	       ;
 
 /* HEAD.SUBM */
@@ -2023,7 +2015,7 @@ assoc_struc_sub : asso_sect /* 0:M */
 
 asso_sect : OPEN DELIM TAG_ASSO mand_pointer
             { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
-							XREF_INDI);
+							XREF_ANY);
 	      if (xr == NULL) HANDLE_ERROR;
 	      $<ctxt>$ = start_element(ELT_SUB_ASSO,
 				       PARENT, $1, $3, $4, 
@@ -2250,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 
-                         { $<ctxt>$
+                         { struct age_value age = gedcom_parse_age($4);
+			   $<ctxt>$
 			     = start_element(ELT_SUB_EVT_AGE,
 					     PARENT, $1, $3, $4, 
-					     GEDCOM_MAKE_STRING(val1, $4));
+					     GEDCOM_MAKE_AGE(val1, age));
 			   START(AGE, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2356,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  
-                    { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
+                    { struct age_value age = gedcom_parse_age($4);
+		      $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
 					       PARENT, $1, $3, $4,
-					       GEDCOM_MAKE_STRING(val1, $4));
+					       GEDCOM_MAKE_AGE(val1, age));
 		      START(AGE, $<ctxt>$)   
                     }   
                     no_std_subs   
@@ -3822,7 +3816,7 @@ void push_countarray()
   }
 }
 
-void set_parenttag(char* tag)
+void set_parenttag(const char* tag)
 {
   strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
 }
@@ -3890,7 +3884,7 @@ void gedcom_set_debug_level(int level, FILE* f)
   }
 }
 
-int gedcom_debug_print(char* s, ...)
+int gedcom_debug_print(const char* s, ...)
 {
   int res = 0;
   if (gedcom_high_level_debug) {
@@ -3908,35 +3902,3 @@ void gedcom_set_error_handling(Gedcom_err_mech mechanism)
 {
   error_mechanism = mechanism;
 }
-
-/* Compatibility handling */
-
-void gedcom_set_compat_handling(int enable_compat)
-{
-  compat_enabled = enable_compat;
-}
-
-void set_compatibility(char* program)
-{
-  if (compat_enabled) {
-    if (! strncmp(program, "ftree", 6)) {
-      gedcom_warning(_("Enabling compatibility with 'ftree'"));
-      compatibility = C_FTREE;
-    }
-    else if (! strncmp(program, "LIFELINES", 9)) {
-      /* Matches "LIFELINES 3.0.2" */
-      gedcom_warning(_("Enabling compatibility with 'Lifelines'"));
-      compatibility = C_LIFELINES;
-      compat_at = 1;
-    }
-    else {
-      compatibility = 0;
-    }
-  }
-}
-
-int compat_mode(int compat_flags)
-{
-  return (compat_flags & compatibility);
-}
-