Moved gedcom_set_error_handling from gedcom.y to make doxygen conversion

[gedcom-parse.git] / gedcom / interface.c

diff --git a/gedcom/interface.c b/gedcom/interface.c
index 061ec4fdad79fe0297abaec8e4439a844f77a4b6..aae15e485dcf73182cb11763b5d2f280fbd80061 100644 (file)
--- a/gedcom/interface.c
+++ b/gedcom/interface.c
@@ -32,8 +32,9 @@ static Gedcom_def_cb       default_cb                         = NULL;
 
 void gedcom_set_default_callback(Gedcom_def_cb func)
 {
-  if (default_cb)
+  if (default_cb) {
     gedcom_error(_("Internal error: Duplicate registration for default callback"));
+  }
   default_cb = func;
 }
 
@@ -73,11 +74,11 @@ Gedcom_ctxt start_record(Gedcom_rec rec,
     return NULL;
 }
 
-void end_record(Gedcom_rec rec, Gedcom_ctxt self)
+void end_record(Gedcom_rec rec, Gedcom_ctxt self, Gedcom_val parsed_value)
 {
   Gedcom_rec_end_cb cb = record_end_callback[rec];
   if (cb != NULL)
-    (*cb)(rec, self);
+    (*cb)(rec, self, parsed_value);
 }
 
 Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent, 
@@ -102,16 +103,37 @@ void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
     (*cb)(elt, parent, self, parsed_value);
 }
 
-char* val_type_str[] = { N_("null value"),
-                        N_("character string"),
-                        N_("date"),
-                         N_("cross-reference") };
+const char* val_type_str[] = { N_("null value"),
+                              N_("character string"),
+                              N_("date"),
+                              N_("age"),
+                              N_("cross-reference") };
 
-void gedcom_cast_error(char* file, int line,
+void gedcom_cast_error(const char* file, int line,
                       Gedcom_val_type tried_type,
                       Gedcom_val_type real_type)
 {
+  int tried_bit=0, real_bit=0;
+  while (tried_type && tried_type % 2 == 0) {
+    tried_bit++;
+    tried_type >>= 1;
+  }
+  while (real_type && real_type % 2 == 0) {
+    real_bit++;
+    real_type >>= 1;
+  }
   gedcom_warning
     (_("Wrong cast of value in file %s, at line %d: %s instead of %s"),
-     file, line, _(val_type_str[tried_type]), _(val_type_str[real_type]));
+     file, line, _(val_type_str[tried_bit]), _(val_type_str[real_bit]));
+}
+
+/** This function allows to customize what happens on an error.  It doesn't
+    influence the generation of error or warning messages, only the behaviour
+    of the parser and its return code.  See \ref Gedcom_err_mech for the
+    possible mechanisms.
+ */
+
+void gedcom_set_error_handling(Gedcom_err_mech mechanism)
+{
+  error_mechanism = mechanism;
 }