X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Finterface.h;h=d766d945eb62c743787abe7821b63bb18ced5583;hb=afb412554732d2b908fe257697d89cb5d71ba1eb;hp=19498fa0f48c489e644c0ed40cd9499368664dff;hpb=0a3842e05ee5ad37ffacefb70f685bbae3ad7fe6;p=gedcom-parse.git

diff --git a/gedcom/interface.h b/gedcom/interface.h
index 19498fa..d766d94 100644
--- a/gedcom/interface.h
+++ b/gedcom/interface.h
@@ -24,12 +24,14 @@
 #ifndef __INTERFACE_H
 #define __INTERFACE_H
 
+#include "gedcom_internal.h"
 #include "gedcom.h"
 
 Gedcom_ctxt start_record(Gedcom_rec rec,
 			 int level, Gedcom_val xref, struct tag_struct tag,
 			 char *raw_value, Gedcom_val parsed_value);
-void        end_record(Gedcom_rec rec, Gedcom_ctxt self);
+void        end_record(Gedcom_rec rec, Gedcom_ctxt self,
+		       Gedcom_val parsed_value);
 
 Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
 			  int level, struct tag_struct tag, char *raw_value,
@@ -37,24 +39,22 @@ Gedcom_ctxt start_element(Gedcom_elt elt, Gedcom_ctxt parent,
 void        end_element(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
 			Gedcom_val parsed_value);
 
-extern Gedcom_val_struct val;
+extern Gedcom_val_struct val1;
+extern Gedcom_val_struct val2;
 
-#define GEDCOM_MAKE(VALUE, TYPE, MEMBER) \
-   (val.type = TYPE, val.value.MEMBER = VALUE, &val)
+#define GEDCOM_MAKE(VAR, VALUE, TYPE, MEMBER) \
+   (VAR.type = TYPE, VAR.value.MEMBER = VALUE, &VAR)
 
-#define GEDCOM_MAKE_NULL() \
-   GEDCOM_MAKE(NULL, GV_NULL, string_val)
+#define GEDCOM_MAKE_NULL(VAR) \
+   GEDCOM_MAKE(VAR, NULL, GV_NULL, string_val)
 
-#define GEDCOM_MAKE_STRING(STRING) \
-   GEDCOM_MAKE(STRING, GV_CHAR_PTR, string_val)
+#define GEDCOM_MAKE_STRING(VAR, STRING) \
+   GEDCOM_MAKE(VAR, STRING, GV_CHAR_PTR, string_val)
 
-#define GEDCOM_MAKE_NULL_OR_STRING(STRING) \
+#define GEDCOM_MAKE_NULL_OR_STRING(VAR, STRING) \
    (STRING == NULL ? \
-    GEDCOM_MAKE_NULL() : \
-    GEDCOM_MAKE_STRING(STRING)) \
-
-#define GEDCOM_MAKE_DATE(DATE) \
-   GEDCOM_MAKE(DATE, GV_DATE_VALUE, date_val)
+    GEDCOM_MAKE_NULL(VAR) : \
+    GEDCOM_MAKE_STRING(VAR, STRING))
 
 
 #endif /* __INTERFACE_H */