dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved context handling, to allow elements out of context.
[gedcom-parse.git]
/
gedcom
/
interface.c
diff --git
a/gedcom/interface.c
b/gedcom/interface.c
index 7556667a253200a4b58ed9d7fab4f0f7f326ec0b..8b42b213f013fc533ba32e10507ebad3cbc5245f 100644
(file)
--- a/
gedcom/interface.c
+++ b/
gedcom/interface.c
@@
-32,6
+32,9
@@
static Gedcom_def_cb default_cb = NULL;
void gedcom_set_default_callback(Gedcom_def_cb func)
{
void gedcom_set_default_callback(Gedcom_def_cb func)
{
+ if (default_cb) {
+ gedcom_error(_("Internal error: Duplicate registration for default callback"));
+ }
default_cb = func;
}
default_cb = func;
}
@@
-39,6
+42,8
@@
void gedcom_subscribe_to_record(Gedcom_rec rec,
Gedcom_rec_start_cb cb_start,
Gedcom_rec_end_cb cb_end)
{
Gedcom_rec_start_cb cb_start,
Gedcom_rec_end_cb cb_end)
{
+ if (record_start_callback[rec] || record_end_callback[rec])
+ gedcom_error(_("Internal error: Duplicate registration for record type %d"), rec);
if (cb_start) {
record_start_callback[rec] = cb_start;
record_end_callback[rec] = cb_end;
if (cb_start) {
record_start_callback[rec] = cb_start;
record_end_callback[rec] = cb_end;
@@
-49,6
+54,8
@@
void gedcom_subscribe_to_element(Gedcom_elt elt,
Gedcom_elt_start_cb cb_start,
Gedcom_elt_end_cb cb_end)
{
Gedcom_elt_start_cb cb_start,
Gedcom_elt_end_cb cb_end)
{
+ if (element_start_callback[elt] || element_end_callback[elt])
+ gedcom_error(_("Internal error: Duplicate registration for element type %d"), elt);
if (cb_start) {
element_start_callback[elt] = cb_start;
element_end_callback[elt] = cb_end;
if (cb_start) {
element_start_callback[elt] = cb_start;
element_end_callback[elt] = cb_end;
@@
-67,11
+74,11
@@
Gedcom_ctxt start_record(Gedcom_rec rec,
return NULL;
}
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)
{
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,
}
Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
@@
-96,16
+103,26
@@
void end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
(*cb)(elt, parent, self, parsed_value);
}
(*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(c
onst c
har* file, int line,
Gedcom_val_type tried_type,
Gedcom_val_type real_type)
{
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"),
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
]));
}
}