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
Test for update of timestamp.
[gedcom-parse.git]
/
gedcom
/
gedcom.y
diff --git
a/gedcom/gedcom.y
b/gedcom/gedcom.y
index f305257db49f2f0f6e59a7c1db9c17c4347036ca..702d1256dcba2c8f921ce3074776e0bc1f2c91d0 100644
(file)
--- a/
gedcom/gedcom.y
+++ b/
gedcom/gedcom.y
@@
-146,8
+146,10
@@
#include "encoding.h"
#include "interface.h"
#include "date.h"
#include "encoding.h"
#include "interface.h"
#include "date.h"
+#include "age.h"
#include "xref.h"
#include "compat.h"
#include "xref.h"
#include "compat.h"
+#include "buffer.h"
int count_level = 0;
int fail = 0;
int count_level = 0;
int fail = 0;
@@
-155,26
+157,28
@@
int gedcom_high_level_debug = 0;
Gedcom_err_mech error_mechanism = IMMED_FAIL;
Gedcom_val_struct val1;
Gedcom_val_struct val2;
Gedcom_err_mech error_mechanism = IMMED_FAIL;
Gedcom_val_struct val1;
Gedcom_val_struct val2;
-
-char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
-char *line_item_buf_ptr;
+void cleanup_line_item_buffer();
+struct safe_buffer line_item_buffer = { NULL, 0, NULL, 0,
+ cleanup_line_item_buffer };
+
+void cleanup_concat_buffer();
+struct safe_buffer concat_buffer = { NULL, 0, NULL, 0, cleanup_concat_buffer };
+
/* These are defined at the bottom of the file */
/* These are defined at the bottom of the file */
-void push_countarray();
-void set_parenttag(char* tag);
+void push_countarray(
int level
);
+void set_parenttag(c
onst c
har* 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);
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 clean_up();
-#define CLEAR_BUFFER(BUF) \
- memset(BUF, 0, sizeof(BUF));
-
#define HANDLE_ERROR \
{ if (error_mechanism == IMMED_FAIL) { \
#define HANDLE_ERROR \
{ if (error_mechanism == IMMED_FAIL) { \
-
YYABORT;
\
+
clean_up(); YYABORT;
\
} \
else if (error_mechanism == DEFER_FAIL) { \
yyerrok; fail = 1; \
} \
else if (error_mechanism == DEFER_FAIL) { \
yyerrok; fail = 1; \
@@
-186,14
+190,14
@@
int check_occurrence(int tag);
#define START1(PARENTTAG) \
{ set_parenttag(#PARENTTAG); \
}
#define START1(PARENTTAG) \
{ set_parenttag(#PARENTTAG); \
}
-#define START2(
PARENTCTXT)
\
+#define START2(
LEVEL,PARENTCTXT)
\
{ set_parentctxt(PARENTCTXT); \
++count_level; \
{ set_parentctxt(PARENTCTXT); \
++count_level; \
- push_countarray(
);
\
+ push_countarray(
LEVEL);
\
}
}
-#define START(PARENTTAG,
PARENTCTXT)
\
+#define START(PARENTTAG,
LEVEL,PARENTCTXT)
\
{ START1(PARENTTAG); \
{ START1(PARENTTAG); \
- START2(
PARENTCTXT);
\
+ START2(
LEVEL,PARENTCTXT);
\
}
#define PARENT \
get_parentctxt(0)
}
#define PARENT \
get_parentctxt(0)
@@
-251,7
+255,7
@@
int check_occurrence(int tag);
}
%token_table
}
%token_table
-%expect 30
4
+%expect 30
8
%token <string> BADTOKEN
%token <number> OPEN
%token <string> BADTOKEN
%token <number> OPEN
@@
-413,7
+417,7
@@
int check_occurrence(int tag);
file : head_sect records trlr_sect
{ if (fail == 1) YYABORT; }
| error
file : head_sect records trlr_sect
{ if (fail == 1) YYABORT; }
| error
- { }
+ {
clean_up();
}
;
records : /* empty */
;
records : /* empty */
@@
-438,7
+442,7
@@
head_sect : OPEN DELIM TAG_HEAD
{ $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1),
$3,
NULL, GEDCOM_MAKE_NULL(val2));
{ $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1),
$3,
NULL, GEDCOM_MAKE_NULL(val2));
- START(HEAD, $<ctxt>$) }
+ START(HEAD, $
1, $
<ctxt>$) }
head_subs
{ if (compat_mode(C_FTREE)) {
CHECK3(SOUR, GEDC, CHAR);
head_subs
{ if (compat_mode(C_FTREE)) {
CHECK3(SOUR, GEDC, CHAR);
@@
-448,13
+452,13
@@
head_sect : OPEN DELIM TAG_HEAD
CHECK1(SOUR);
compat_generate_submitter_link($<ctxt>4);
compat_generate_gedcom($<ctxt>4);
CHECK1(SOUR);
compat_generate_submitter_link($<ctxt>4);
compat_generate_gedcom($<ctxt>4);
- if (compat_generate_char($<ctxt>4))
YYABORT
;
+ if (compat_generate_char($<ctxt>4))
HANDLE_ERROR
;
}
else
CHECK4(SOUR, SUBM, GEDC, CHAR)
}
CLOSE
}
else
CHECK4(SOUR, SUBM, GEDC, CHAR)
}
CLOSE
- { end_record(REC_HEAD, $<ctxt>4);
+ { end_record(REC_HEAD, $<ctxt>4
, GEDCOM_MAKE_NULL(val1)
);
if (compat_mode(C_FTREE | C_LIFELINES))
compat_generate_submitter();
}
if (compat_mode(C_FTREE | C_LIFELINES))
compat_generate_submitter();
}
@@
-488,12
+492,13
@@
head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
$<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
$<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(SOUR, $<ctxt>$)
+ START(SOUR, $
1, $
<ctxt>$)
}
head_sour_subs
{ CHECK0 }
CLOSE
}
head_sour_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5, NULL); }
+ { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1)); }
;
head_sour_subs : /* empty */
;
head_sour_subs : /* empty */
@@
-511,39
+516,39
@@
head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_VERS, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_VERS, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(VERS, $<ctxt>$)
+ START(VERS, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_VERS,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_VERS,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_NAME, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_NAME, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NAME, $<ctxt>$)
+ START(NAME, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_NAME,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_NAME,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_CORP, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_CORP, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CORP, $<ctxt>$)
+ START(CORP, $
1, $
<ctxt>$)
}
head_sour_corp_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_CORP,
}
head_sour_corp_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_CORP,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-559,13
+564,13
@@
head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA, PARENT,
$1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(DATA, $<ctxt>$)
+ START(DATA, $
1, $
<ctxt>$)
}
head_sour_data_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA,
}
head_sour_data_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-584,13
+589,14
@@
head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
= start_element(ELT_HEAD_SOUR_DATA_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
= start_element(ELT_HEAD_SOUR_DATA_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA_DATE,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA_DATE,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
}
;
head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
@@
-598,13
+604,14
@@
head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
= start_element(ELT_HEAD_SOUR_DATA_COPR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_HEAD_SOUR_DATA_COPR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(COPR, $<ctxt>$)
+ START(COPR, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA_COPR,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SOUR_DATA_COPR,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-613,13
+620,13
@@
head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_DEST,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_DEST,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(DEST, $<ctxt>$)
+ START(DEST, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DEST,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DEST,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-629,13
+636,13
@@
head_date_sect : OPEN DELIM TAG_DATE mand_line_item
$<ctxt>$ = start_element(ELT_HEAD_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
$<ctxt>$ = start_element(ELT_HEAD_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
head_date_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DATE,
}
head_date_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DATE,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-651,21
+658,21
@@
head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_DATE_TIME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_DATE_TIME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TIME, $<ctxt>$)
+ START(TIME, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DATE_TIME,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_DATE_TIME,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
/* HEAD.TIME (Only for 'Lifelines' compatibility) */
/* Just ignore the time... */
}
;
/* 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 */
;
/* HEAD.SUBM */
@@
-676,13
+683,13
@@
head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
$<ctxt>$ = start_element(ELT_HEAD_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_HEAD_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SUBM, $<ctxt>$)
+ START(SUBM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SUBM,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SUBM,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
/* HEAD.SUBN */
}
;
/* HEAD.SUBN */
@@
-693,13
+700,13
@@
head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
$<ctxt>$ = start_element(ELT_HEAD_SUBN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_HEAD_SUBN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SUBN, $<ctxt>$)
+ START(SUBN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SUBN,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_SUBN,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
/* HEAD.FILE */
}
;
/* HEAD.FILE */
@@
-707,12
+714,13
@@
head_file_sect : OPEN DELIM TAG_FILE mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_FILE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_FILE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FILE, $<ctxt>$)
+ START(FILE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_FILE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_HEAD_FILE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
/* HEAD.COPR */
}
;
/* HEAD.COPR */
@@
-720,12
+728,13
@@
head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_COPR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_COPR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(COPR, $<ctxt>$)
+ START(COPR, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_COPR, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_HEAD_COPR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
/* HEAD.GEDC */
}
;
/* HEAD.GEDC */
@@
-733,12
+742,13
@@
head_gedc_sect : OPEN DELIM TAG_GEDC
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(GEDC, $<ctxt>$)
+ START(GEDC, $
1, $
<ctxt>$)
}
head_gedc_subs
{ CHECK2(VERS, FORM) }
CLOSE
}
head_gedc_subs
{ CHECK2(VERS, FORM) }
CLOSE
- { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-754,26
+764,26
@@
head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC_VERS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC_VERS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(VERS, $<ctxt>$)
+ START(VERS, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_GEDC_VERS,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_GEDC_VERS,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_GEDC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FORM, $<ctxt>$)
+ START(FORM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_GEDC_FORM,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_GEDC_FORM,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-781,16
+791,17
@@
head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
head_char_sect : OPEN DELIM TAG_CHAR mand_line_item
{ /* Don't allow to continue if conversion context couldn't
be opened */
head_char_sect : OPEN DELIM TAG_CHAR mand_line_item
{ /* Don't allow to continue if conversion context couldn't
be opened */
- if (open_conv_to_internal($4) == 0)
YYABORT
;
+ if (open_conv_to_internal($4) == 0)
HANDLE_ERROR
;
$<ctxt>$ = start_element(ELT_HEAD_CHAR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
$<ctxt>$ = start_element(ELT_HEAD_CHAR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CHAR, $<ctxt>$)
+ START(CHAR, $
1, $
<ctxt>$)
}
head_char_subs
{ CHECK0 }
CLOSE
}
head_char_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_CHAR, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_HEAD_CHAR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-805,13
+816,13
@@
head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_CHAR_VERS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_CHAR_VERS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(VERS, $<ctxt>$)
+ START(VERS, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_CHAR_VERS,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_CHAR_VERS,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-820,12
+831,13
@@
head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_LANG,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_LANG,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(LANG, $<ctxt>$)
+ START(LANG, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_LANG, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_HEAD_LANG, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
/* HEAD.PLAC */
}
;
/* HEAD.PLAC */
@@
-833,12
+845,13
@@
head_plac_sect : OPEN DELIM TAG_PLAC
{ $<ctxt>$ = start_element(ELT_HEAD_PLAC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_HEAD_PLAC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(PLAC, $<ctxt>$)
+ START(PLAC, $
1, $
<ctxt>$)
}
head_plac_subs
{ CHECK1(FORM) }
CLOSE
}
head_plac_subs
{ CHECK1(FORM) }
CLOSE
- { end_element(ELT_HEAD_PLAC, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_HEAD_PLAC, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-853,13
+866,13
@@
head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_PLAC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_PLAC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FORM, $<ctxt>$)
+ START(FORM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_PLAC_FORM,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_HEAD_PLAC_FORM,
- PARENT, $<ctxt>5,
NULL
);
+ PARENT, $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-868,12
+881,16
@@
head_note_sect : OPEN DELIM TAG_NOTE mand_line_item
{ $<ctxt>$ = start_element(ELT_HEAD_NOTE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_HEAD_NOTE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NOTE, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(NOTE, $1, $<ctxt>$)
}
head_note_subs
{ CHECK0 }
CLOSE
}
head_note_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_HEAD_NOTE, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_HEAD_NOTE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-903,11
+920,11
@@
fam_rec : OPEN DELIM POINTER DELIM TAG_FAM
$1, GEDCOM_MAKE_XREF_PTR(val1, xr),
$5,
NULL, GEDCOM_MAKE_NULL(val2));
$1, GEDCOM_MAKE_XREF_PTR(val1, xr),
$5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(FAM, $<ctxt>$) }
+ START(FAM, $
1, $
<ctxt>$) }
fam_subs
{ CHECK0 }
CLOSE
fam_subs
{ CHECK0 }
CLOSE
- { end_record(REC_FAM, $<ctxt>6); }
+ { end_record(REC_FAM, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
fam_subs : /* empty */
;
fam_subs : /* empty */
@@
-937,12
+954,13
@@
fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
$<ctxt>$ = start_element(ELT_FAM_HUSB,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_FAM_HUSB,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(HUSB, $<ctxt>$)
+ START(HUSB, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_FAM_HUSB, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_FAM_HUSB, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-954,12
+972,13
@@
fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
$<ctxt>$ = start_element(ELT_FAM_WIFE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_FAM_WIFE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(WIFE, $<ctxt>$)
+ START(WIFE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_FAM_WIFE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_FAM_WIFE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-971,12
+990,13
@@
fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
$<ctxt>$ = start_element(ELT_FAM_CHIL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_FAM_CHIL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(CHIL, $<ctxt>$)
+ START(CHIL, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_FAM_CHIL, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_FAM_CHIL, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-985,12
+1005,13
@@
fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
{ $<ctxt>$ = start_element(ELT_FAM_NCHI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_FAM_NCHI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NCHI, $<ctxt>$)
+ START(NCHI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_FAM_NCHI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_FAM_NCHI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1002,12
+1023,13
@@
fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
$<ctxt>$ = start_element(ELT_FAM_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_FAM_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SUBM, $<ctxt>$)
+ START(SUBM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_FAM_SUBM, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_FAM_SUBM, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1021,11
+1043,11
@@
indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI
$<ctxt>$ = start_record(REC_INDI,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_INDI,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(INDI, $<ctxt>$) }
+ START(INDI, $
1, $
<ctxt>$) }
indi_subs
{ CHECK0 }
CLOSE
indi_subs
{ CHECK0 }
CLOSE
- { end_record(REC_INDI, $<ctxt>6); }
+ { end_record(REC_INDI, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
indi_subs : /* empty */
;
indi_subs : /* empty */
@@
-1063,12
+1085,13
@@
indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
{ $<ctxt>$ = start_element(ELT_INDI_RESN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_INDI_RESN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RESN, $<ctxt>$)
+ START(RESN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_RESN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_RESN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1077,12
+1100,13
@@
indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item
{ $<ctxt>$ = start_element(ELT_INDI_SEX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_INDI_SEX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(SEX, $<ctxt>$)
+ START(SEX, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_SEX, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_SEX, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1094,12
+1118,13
@@
indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
$<ctxt>$ = start_element(ELT_INDI_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_INDI_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SUBM, $<ctxt>$)
+ START(SUBM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_SUBM, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_SUBM, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1111,12
+1136,13
@@
indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
$<ctxt>$ = start_element(ELT_INDI_ALIA,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_INDI_ALIA,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(ALIA, $<ctxt>$)
+ START(ALIA, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_ALIA, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_ALIA, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1128,12
+1154,13
@@
indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
$<ctxt>$ = start_element(ELT_INDI_ANCI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_INDI_ANCI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(ANCI, $<ctxt>$)
+ START(ANCI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_ANCI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_ANCI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1145,12
+1172,13
@@
indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
$<ctxt>$ = start_element(ELT_INDI_DESI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_INDI_DESI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(DESI, $<ctxt>$)
+ START(DESI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_DESI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_DESI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1159,12
+1187,13
@@
indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
{ $<ctxt>$ = start_element(ELT_INDI_RFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_INDI_RFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RFN, $<ctxt>$)
+ START(RFN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_RFN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_RFN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1173,12
+1202,13
@@
indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item
{ $<ctxt>$ = start_element(ELT_INDI_AFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_INDI_AFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(AFN, $<ctxt>$)
+ START(AFN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_INDI_AFN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_INDI_AFN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1186,25
+1216,27
@@
indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item
ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
{ if (compat_mode(C_FTREE)) {
Gedcom_ctxt par = compat_generate_resi_start(PARENT);
ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
{ if (compat_mode(C_FTREE)) {
Gedcom_ctxt par = compat_generate_resi_start(PARENT);
- START(RESI, par);
+ START(RESI,
$1,
par);
$<ctxt>$
= start_element(ELT_SUB_ADDR,
par, $1 + 1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
$<ctxt>$
= start_element(ELT_SUB_ADDR,
par, $1 + 1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
- START(ADDR, $<ctxt>$);
+ START(ADDR, $
1, $
<ctxt>$);
}
}
- else { START(ADDR, NULL) }
+ else { START(ADDR,
$1,
NULL) }
}
ftree_addr_subs
{ CHECK0 }
CLOSE
{ if (compat_mode(C_FTREE)) {
Gedcom_ctxt par = PARENT;
}
ftree_addr_subs
{ CHECK0 }
CLOSE
{ if (compat_mode(C_FTREE)) {
Gedcom_ctxt par = PARENT;
- end_element(ELT_SUB_ADDR, par, $<ctxt>5, NULL);
+ end_element(ELT_SUB_ADDR, par, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
CHECK0;
compat_generate_resi_end(PARENT, par);
}
}
CHECK0;
compat_generate_resi_end(PARENT, par);
}
}
+ ;
ftree_addr_subs : /* empty */
| ftree_addr_subs ftree_addr_sub
ftree_addr_subs : /* empty */
| ftree_addr_subs ftree_addr_sub
@@
-1220,13
+1252,13
@@
ftree_addr_phon_sect : OPEN DELIM TAG_PHON mand_line_item
= start_element(ELT_SUB_PHON,
GRANDPARENT(1), $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_PHON,
GRANDPARENT(1), $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PHON, $<ctxt>$)
+ START(PHON, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PHON, GRANDPARENT(1),
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PHON, GRANDPARENT(1),
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1240,11
+1272,11
@@
multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE
$<ctxt>$ = start_record(REC_OBJE,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_OBJE,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(OBJE, $<ctxt>$) }
+ START(OBJE, $
1, $
<ctxt>$) }
obje_subs
{ CHECK2(FORM, BLOB) }
CLOSE
obje_subs
{ CHECK2(FORM, BLOB) }
CLOSE
- { end_record(REC_OBJE, $<ctxt>6); }
+ { end_record(REC_OBJE, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
obje_subs : /* empty */
;
obje_subs : /* empty */
@@
-1266,12
+1298,13
@@
obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
{ $<ctxt>$ = start_element(ELT_OBJE_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_OBJE_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FORM, $<ctxt>$)
+ START(FORM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_OBJE_FORM, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_OBJE_FORM, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1280,12
+1313,13
@@
obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
{ $<ctxt>$ = start_element(ELT_OBJE_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_OBJE_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TITL, $<ctxt>$)
+ START(TITL, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_OBJE_TITL, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_OBJE_TITL, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1294,12
+1328,15
@@
obje_blob_sect : OPEN DELIM TAG_BLOB
{ $<ctxt>$ = start_element(ELT_OBJE_BLOB,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_OBJE_BLOB,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(BLOB, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ START(BLOB, $1, $<ctxt>$)
}
obje_blob_subs
{ CHECK1(CONT) }
CLOSE
}
obje_blob_subs
{ CHECK1(CONT) }
CLOSE
- { end_element(ELT_OBJE_BLOB, PARENT, $<ctxt>4, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_OBJE_BLOB, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1315,13
+1352,14
@@
obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item
{ $<ctxt>$ = start_element(ELT_OBJE_BLOB_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_OBJE_BLOB_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CONT, $<ctxt>$)
+ safe_buf_append(&concat_buffer, $4);
+ START(CONT, $1, $<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_OBJE_BLOB_CONT, PARENT,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_OBJE_BLOB_CONT, PARENT,
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1333,12
+1371,13
@@
obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
$<ctxt>$ = start_element(ELT_OBJE_OBJE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_OBJE_OBJE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(OBJE, $<ctxt>$)
+ START(OBJE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_OBJE_OBJE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_OBJE_OBJE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1352,11
+1391,15
@@
note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
$<ctxt>$ = start_record(REC_NOTE,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
$6, GEDCOM_MAKE_STRING(val2, $6));
$<ctxt>$ = start_record(REC_NOTE,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
$6, GEDCOM_MAKE_STRING(val2, $6));
- START(NOTE, $<ctxt>$) }
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $6);
+ START(NOTE, $1, $<ctxt>$) }
note_subs
{ CHECK0 }
CLOSE
note_subs
{ CHECK0 }
CLOSE
- { end_record(REC_NOTE, $<ctxt>7); }
+ { char* complete = get_buf_string(&concat_buffer);
+ end_record(REC_NOTE, $<ctxt>7,
+ GEDCOM_MAKE_STRING(val1, complete)); }
;
note_line_item : /* empty */
;
note_line_item : /* empty */
@@
-1393,11
+1436,11
@@
repos_rec : OPEN DELIM POINTER DELIM TAG_REPO
$<ctxt>$ = start_record(REC_REPO,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_REPO,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(REPO, $<ctxt>$) }
+ START(REPO, $
1, $
<ctxt>$) }
repo_subs
{ CHECK0 }
CLOSE
repo_subs
{ CHECK0 }
CLOSE
- { end_record(REC_REPO, $<ctxt>6); }
+ { end_record(REC_REPO, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
repo_subs : /* empty */
;
repo_subs : /* empty */
@@
-1417,12
+1460,13
@@
repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
{ $<ctxt>$ = start_element(ELT_REPO_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_REPO_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NAME, $<ctxt>$)
+ START(NAME, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_REPO_NAME, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_REPO_NAME, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1436,11
+1480,11
@@
source_rec : OPEN DELIM POINTER DELIM TAG_SOUR
$<ctxt>$ = start_record(REC_SOUR,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_SOUR,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(SOUR, $<ctxt>$) }
+ START(SOUR, $
1, $
<ctxt>$) }
sour_subs
{ CHECK0 }
CLOSE
sour_subs
{ CHECK0 }
CLOSE
- { end_record(REC_SOUR, $<ctxt>6); }
+ { end_record(REC_SOUR, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
sour_subs : /* empty */
;
sour_subs : /* empty */
@@
-1466,12
+1510,13
@@
sour_data_sect : OPEN DELIM TAG_DATA
{ $<ctxt>$ = start_element(ELT_SOUR_DATA,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SOUR_DATA,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(DATA, $<ctxt>$)
+ START(DATA, $
1, $
<ctxt>$)
}
sour_data_subs
{ CHECK0 }
CLOSE
}
sour_data_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_DATA, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SOUR_DATA, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1489,13
+1534,13
@@
sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_DATA_EVEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_DATA_EVEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(EVEN, $<ctxt>$)
+ START(EVEN, $
1, $
<ctxt>$)
}
sour_data_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN, PARENT,
}
sour_data_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN, PARENT,
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1514,13
+1559,13
@@
sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
= start_element(ELT_SOUR_DATA_EVEN_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
= start_element(ELT_SOUR_DATA_EVEN_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT,
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1529,13
+1574,13
@@
sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
= start_element(ELT_SOUR_DATA_EVEN_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SOUR_DATA_EVEN_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PLAC, $<ctxt>$)
+ START(PLAC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT,
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1543,13
+1588,13
@@
sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_DATA_AGNC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_DATA_AGNC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(AGNC, $<ctxt>$)
+ START(AGNC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_AGNC, PARENT,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SOUR_DATA_AGNC, PARENT,
- $<ctxt>5,
NULL
);
+ $<ctxt>5,
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-1558,12
+1603,16
@@
sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_AUTH,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_AUTH,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(AUTH, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(AUTH, $1, $<ctxt>$)
}
sour_auth_subs
{ CHECK0 }
CLOSE
}
sour_auth_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_AUTH, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SOUR_AUTH, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1580,12
+1629,16
@@
sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TITL, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(TITL, $1, $<ctxt>$)
}
sour_titl_subs
{ CHECK0 }
CLOSE
}
sour_titl_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_TITL, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SOUR_TITL, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1602,12
+1655,13
@@
sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_ABBR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_ABBR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ABBR, $<ctxt>$)
+ START(ABBR, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_ABBR, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SOUR_ABBR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1616,12
+1670,16
@@
sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_PUBL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_PUBL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PUBL, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(PUBL, $1, $<ctxt>$)
}
sour_publ_subs
{ CHECK0 }
CLOSE
}
sour_publ_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_PUBL, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SOUR_PUBL, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1638,12
+1696,16
@@
sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item
{ $<ctxt>$ = start_element(ELT_SOUR_TEXT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SOUR_TEXT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TEXT, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(TEXT, $1, $<ctxt>$)
}
sour_text_subs
{ CHECK0 }
CLOSE
}
sour_text_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SOUR_TEXT, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SOUR_TEXT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1665,11
+1727,11
@@
submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN
$<ctxt>$ = start_record(REC_SUBN,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_SUBN,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(SUBN, $<ctxt>$) }
+ START(SUBN, $
1, $
<ctxt>$) }
subn_subs
{ CHECK0 }
CLOSE
subn_subs
{ CHECK0 }
CLOSE
- { end_record(REC_SUBN, $<ctxt>6); }
+ { end_record(REC_SUBN, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
subn_subs : /* empty */
;
subn_subs : /* empty */
@@
-1694,12
+1756,13
@@
subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
$<ctxt>$ = start_element(ELT_SUBN_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_SUBN_SUBM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SUBM, $<ctxt>$)
+ START(SUBM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_SUBM, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_SUBM, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1708,12
+1771,13
@@
subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_FAMF,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_FAMF,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FAMF, $<ctxt>$)
+ START(FAMF, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_FAMF, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_FAMF, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1722,12
+1786,13
@@
subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TEMP, $<ctxt>$)
+ START(TEMP, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_TEMP, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_TEMP, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1736,12
+1801,13
@@
subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_ANCE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_ANCE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ANCE, $<ctxt>$)
+ START(ANCE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_ANCE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_ANCE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1750,12
+1816,13
@@
subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_DESC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_DESC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(DESC, $<ctxt>$)
+ START(DESC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_DESC, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_DESC, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1764,12
+1831,13
@@
subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_ORDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_ORDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ORDI, $<ctxt>$)
+ START(ORDI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_ORDI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_ORDI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1778,12
+1846,13
@@
subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBN_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBN_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RIN, $<ctxt>$)
+ START(RIN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBN_RIN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBN_RIN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1797,11
+1866,11
@@
submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM
$<ctxt>$ = start_record(REC_SUBM,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
$<ctxt>$ = start_record(REC_SUBM,
$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
NULL, GEDCOM_MAKE_NULL(val2));
- START(SUBM, $<ctxt>$) }
+ START(SUBM, $
1, $
<ctxt>$) }
subm_subs
{ CHECK1(NAME) }
CLOSE
subm_subs
{ CHECK1(NAME) }
CLOSE
- { end_record(REC_SUBM, $<ctxt>6); }
+ { end_record(REC_SUBM, $<ctxt>6
, GEDCOM_MAKE_NULL(val1)
); }
;
subm_subs : /* empty */
;
subm_subs : /* empty */
@@
-1823,12
+1892,13
@@
subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBM_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBM_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NAME, $<ctxt>$)
+ START(NAME, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBM_NAME, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBM_NAME, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1837,12
+1907,13
@@
subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBM_LANG,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBM_LANG,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(LANG, $<ctxt>$)
+ START(LANG, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBM_LANG, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBM_LANG, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1851,12
+1922,13
@@
subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBM_RFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBM_RFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RFN, $<ctxt>$)
+ START(RFN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBM_RFN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBM_RFN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1865,12
+1937,13
@@
subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUBM_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUBM_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RIN, $<ctxt>$)
+ START(RIN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUBM_RIN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUBM_RIN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1887,12
+1960,16
@@
addr_sect : OPEN DELIM TAG_ADDR mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_ADDR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ADDR, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(ADDR, $1, $<ctxt>$)
}
addr_subs
{ CHECK0 }
CLOSE
}
addr_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SUB_ADDR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-1914,84
+1991,93
@@
addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CONT, $<ctxt>$)
+ SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
+ safe_buf_append(&concat_buffer, $4);
+ START(CONT, $1, $<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_CONT, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_CONT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR1,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR1,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ADR1, $<ctxt>$)
+ START(ADR1, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_ADR1, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_ADR1, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR2,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR2,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ADR2, $<ctxt>$)
+ START(ADR2, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_ADR2, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_ADR2, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CITY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CITY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CITY, $<ctxt>$)
+ START(CITY, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_CITY, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_CITY, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_STAE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_STAE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(STAE, $<ctxt>$)
+ START(STAE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_STAE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_STAE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_post_sect : OPEN DELIM TAG_POST mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_POST,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_post_sect : OPEN DELIM TAG_POST mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_POST,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(POST, $<ctxt>$)
+ START(POST, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_POST, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_POST, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CTRY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ADDR_CTRY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CTRY, $<ctxt>$)
+ START(CTRY, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ADDR_CTRY, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ADDR_CTRY, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-1999,12
+2085,13
@@
phon_sect : OPEN DELIM TAG_PHON mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PHON,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_PHON,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PHON, $<ctxt>$)
+ START(PHON, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_PHON, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_PHON, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2014,17
+2101,18
@@
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,
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,
GEDCOM_MAKE_XREF_PTR(val1, xr));
if (xr == NULL) HANDLE_ERROR;
$<ctxt>$ = start_element(ELT_SUB_ASSO,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(ASSO, $<ctxt>$)
+ START(ASSO, $
1, $
<ctxt>$)
}
asso_subs
{ CHECK2(TYPE,RELA) }
CLOSE
}
asso_subs
{ CHECK2(TYPE,RELA) }
CLOSE
- { end_element(ELT_SUB_ASSO, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ASSO, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2040,12
+2128,13
@@
asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ASSO_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_ASSO_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TYPE, $<ctxt>$)
+ START(TYPE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ASSO_TYPE, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ASSO_TYPE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2053,12
+2142,13
@@
asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_ASSO_RELA,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_ASSO_RELA,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RELA, $<ctxt>$)
+ START(RELA, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_ASSO_RELA, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_ASSO_RELA, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2070,12
+2160,13
@@
change_date_chan_sect : OPEN DELIM TAG_CHAN
{ $<ctxt>$ = start_element(ELT_SUB_CHAN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_CHAN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(CHAN, $<ctxt>$)
+ START(CHAN, $
1, $
<ctxt>$)
}
change_date_chan_subs
{ CHECK1(DATE) }
CLOSE
}
change_date_chan_subs
{ CHECK1(DATE) }
CLOSE
- { end_element(ELT_SUB_CHAN, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_CHAN, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2093,12
+2184,12
@@
change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item
$<ctxt>$ = start_element(ELT_SUB_CHAN_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
$<ctxt>$ = start_element(ELT_SUB_CHAN_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$) }
+ START(DATE, $
1, $
<ctxt>$) }
change_date_date_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_CHAN_DATE, PARENT, $<ctxt>5,
change_date_date_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_CHAN_DATE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2115,13
+2206,13
@@
change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
= start_element(ELT_SUB_CHAN_TIME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_CHAN_TIME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TIME, $<ctxt>$)
+ START(TIME, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_CHAN_TIME, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_CHAN_TIME, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2136,12
+2227,13
@@
famc_sect : OPEN DELIM TAG_FAMC mand_pointer
$<ctxt>$ = start_element(ELT_SUB_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
$<ctxt>$ = start_element(ELT_SUB_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(FAMC, $<ctxt>$)
+ START(FAMC, $
1, $
<ctxt>$)
}
famc_subs
{ CHECK0 }
CLOSE
}
famc_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_FAMC, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_FAMC, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2158,12
+2250,13
@@
famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_FAMC_PEDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_FAMC_PEDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PEDI, $<ctxt>$)
+ START(PEDI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_FAMC_PEDI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_FAMC_PEDI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2176,12
+2269,15
@@
cont_sect : OPEN DELIM TAG_CONT mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_CONT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CONT, $<ctxt>$)
+ SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
+ safe_buf_append(&concat_buffer, $4);
+ START(CONT, $1, $<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2189,12
+2285,14
@@
conc_sect : OPEN DELIM TAG_CONC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_CONC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_CONC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CONC, $<ctxt>$)
+ safe_buf_append(&concat_buffer, $4);
+ START(CONC, $1, $<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2216,13
+2314,13
@@
event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
= start_element(ELT_SUB_EVT_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_EVT_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TYPE, $<ctxt>$)
+ START(TYPE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_TYPE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_TYPE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
}
;
event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
@@
-2231,27
+2329,28
@@
event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
= start_element(ELT_SUB_EVT_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
= start_element(ELT_SUB_EVT_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_DATE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_DATE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
event_detail_age_sect : OPEN DELIM TAG_AGE 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,
= start_element(ELT_SUB_EVT_AGE,
PARENT, $1, $3, $4,
- GEDCOM_MAKE_
STRING(val1, $4
));
- START(AGE, $<ctxt>$)
+ GEDCOM_MAKE_
AGE(val1, age
));
+ START(AGE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_AGE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_AGE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
}
;
event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
@@
-2259,13
+2358,13
@@
event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
= start_element(ELT_SUB_EVT_AGNC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_EVT_AGNC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(AGNC, $<ctxt>$)
+ START(AGNC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_AGNC, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_AGNC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
}
;
event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
@@
-2273,13
+2372,13
@@
event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
= start_element(ELT_SUB_EVT_CAUS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_EVT_CAUS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CAUS, $<ctxt>$)
+ START(CAUS, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_CAUS, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_EVT_CAUS, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2293,12
+2392,13
@@
fam_event_sect : OPEN DELIM fam_event_tag opt_value
= start_element(ELT_SUB_FAM_EVT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
= start_element(ELT_SUB_FAM_EVT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
- START2($<ctxt>$);
+ START2($
1, $
<ctxt>$);
}
fam_event_subs
{ CHECK0 }
CLOSE
}
fam_event_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_FAM_EVT, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_FAM_EVT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2328,13
+2428,13
@@
fam_even_husb_sect : OPEN DELIM TAG_HUSB
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_HUSB,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_HUSB,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(HUSB, $<ctxt>$)
+ START(HUSB, $
1, $
<ctxt>$)
}
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $<ctxt>4,
}
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $<ctxt>4,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2347,16
+2447,17
@@
fam_even_husb_sub : fam_even_age_sect { OCCUR2(AGE, 1, 1) }
;
fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item
;
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,
PARENT, $1, $3, $4,
- GEDCOM_MAKE_
STRING(val1, $4
));
- START(AGE, $<ctxt>$)
+ GEDCOM_MAKE_
AGE(val1, age
));
+ START(AGE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_AGE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_AGE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2364,13
+2465,13
@@
fam_even_wife_sect : OPEN DELIM TAG_WIFE
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_WIFE,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_WIFE,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(WIFE, $<ctxt>$)
+ START(WIFE, $
1, $
<ctxt>$)
}
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $<ctxt>4,
}
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $<ctxt>4,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2378,13
+2479,13
@@
fam_gen_even_sect : OPEN DELIM TAG_EVEN
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_EVEN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_EVEN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(EVEN, $<ctxt>$)
+ START(EVEN, $
1, $
<ctxt>$)
}
fam_gen_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $<ctxt>4,
}
fam_gen_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $<ctxt>4,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2407,13
+2508,13
@@
ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_IDENT_REFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_IDENT_REFN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(REFN, $<ctxt>$)
+ START(REFN, $
1, $
<ctxt>$)
}
ident_refn_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_REFN, PARENT, $<ctxt>5,
}
ident_refn_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_REFN, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2430,13
+2531,13
@@
ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
= start_element(ELT_SUB_IDENT_REFN_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_IDENT_REFN_TYPE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TYPE, $<ctxt>$)
+ START(TYPE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2444,13
+2545,13
@@
ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_IDENT_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_IDENT_RIN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(RIN, $<ctxt>$)
+ START(RIN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_RIN, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_IDENT_RIN, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2463,13
+2564,15
@@
indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_ATTR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_ATTR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START2($<ctxt>$);
+ START2($
1, $
<ctxt>$);
}
indiv_attr_event_subs
{ CHECK0 }
CLOSE
}
indiv_attr_event_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
}
+ ;
indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) }
| TAG_DSCR { $$ = $1; START1(DSCR) }
indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) }
| TAG_DSCR { $$ = $1; START1(DSCR) }
@@
-2483,17
+2586,19
@@
indiv_attr_tag : TAG_CAST { $$ = $1; START1(CAST) }
| TAG_RELI { $$ = $1; START1(RELI) }
| TAG_SSN { $$ = $1; START1(SSN) }
| TAG_TITL { $$ = $1; START1(TITL) }
| TAG_RELI { $$ = $1; START1(RELI) }
| TAG_SSN { $$ = $1; START1(SSN) }
| TAG_TITL { $$ = $1; START1(TITL) }
+ ;
indiv_resi_sect : OPEN DELIM TAG_RESI
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_RESI,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
indiv_resi_sect : OPEN DELIM TAG_RESI
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_RESI,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(RESI, $<ctxt>$)
+ START(RESI, $
1, $
<ctxt>$)
}
indiv_attr_event_subs
{ CHECK0 }
CLOSE
}
indiv_attr_event_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_RESI, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_INDIV_RESI, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2517,12
+2622,13
@@
indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value
= start_element(ELT_SUB_INDIV_BIRT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
= start_element(ELT_SUB_INDIV_BIRT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
- START2($<ctxt>$);
+ START2($
1, $
<ctxt>$);
}
indiv_birt_subs
{ CHECK0 }
CLOSE
}
indiv_birt_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_BIRT, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_INDIV_BIRT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2548,13
+2654,13
@@
indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
= start_element(ELT_SUB_INDIV_BIRT_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_INDIV_BIRT_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(FAMC, $<ctxt>$)
+ START(FAMC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2563,12
+2669,13
@@
indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value
= start_element(ELT_SUB_INDIV_GEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
= start_element(ELT_SUB_INDIV_GEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
- START2($<ctxt>$);
+ START2($
1, $
<ctxt>$);
}
indiv_gen_subs
{ CHECK0 }
CLOSE
}
indiv_gen_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_GEN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_INDIV_GEN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2606,11
+2713,12
@@
indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value
= start_element(ELT_SUB_INDIV_ADOP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
= start_element(ELT_SUB_INDIV_ADOP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
- START(ADOP, $<ctxt>$) }
+ START(ADOP, $
1, $
<ctxt>$) }
indiv_adop_subs
{ CHECK0 }
CLOSE
indiv_adop_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_ADOP, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_INDIV_ADOP, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2632,12
+2740,12
@@
indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
= start_element(ELT_SUB_INDIV_ADOP_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_INDIV_ADOP_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(FAMC, $<ctxt>$) }
+ START(FAMC, $
1, $
<ctxt>$) }
indiv_adop_famc_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $<ctxt>5,
indiv_adop_famc_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2654,12
+2762,13
@@
indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
= start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ADOP, $<ctxt>$) }
+ START(ADOP, $
1, $
<ctxt>$) }
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2667,11
+2776,12
@@
indiv_even_sect : OPEN DELIM TAG_EVEN
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_EVEN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_INDIV_EVEN,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(EVEN, $<ctxt>$) }
+ START(EVEN, $
1, $
<ctxt>$) }
indiv_gen_subs
{ CHECK0 }
CLOSE
indiv_gen_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_INDIV_EVEN, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_INDIV_EVEN, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2684,12
+2794,13
@@
lio_bapl_sect : OPEN DELIM lio_bapl_tag
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START2($<ctxt>$);
+ START2($
1, $
<ctxt>$);
}
lio_bapl_subs
{ CHECK0 }
CLOSE
}
lio_bapl_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_LIO_BAPL, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_LIO_BAPL, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2715,13
+2826,13
@@
lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_STAT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_STAT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(STAT, $<ctxt>$)
+ START(STAT, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
}
;
lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
@@
-2729,39
+2840,39
@@
lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
$<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
$<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TEMP, $<ctxt>$)
+ START(TEMP, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PLAC, $<ctxt>$)
+ START(PLAC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2769,12
+2880,13
@@
lio_slgc_sect : OPEN DELIM TAG_SLGC
{ $<ctxt>$ = start_element(ELT_SUB_LIO_SLGC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_LIO_SLGC,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(SLGC, $<ctxt>$)
+ START(SLGC, $
1, $
<ctxt>$)
}
lio_slgc_subs
{ CHECK1(FAMC) }
CLOSE
}
lio_slgc_subs
{ CHECK1(FAMC) }
CLOSE
- { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2794,13
+2906,13
@@
lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
= start_element(ELT_SUB_LIO_SLGC_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_LIO_SLGC_FAMC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(FAMC, $<ctxt>$)
+ START(FAMC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2812,11
+2924,12
@@
lss_slgs_sect : OPEN DELIM TAG_SLGS
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(SLGS, $<ctxt>$) }
+ START(SLGS, $
1, $
<ctxt>$) }
lss_slgs_subs
{ CHECK0 }
CLOSE
lss_slgs_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, NULL);
+ { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2837,13
+2950,13
@@
lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_STAT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_STAT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(STAT, $<ctxt>$)
+ START(STAT, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
}
;
lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
@@
-2851,39
+2964,39
@@
lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
$<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
$<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_TEMP,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TEMP, $<ctxt>$)
+ START(TEMP, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PLAC, $<ctxt>$)
+ START(PLAC, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2901,13
+3014,13
@@
multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
= start_element(ELT_SUB_MULTIM_OBJE,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_MULTIM_OBJE,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(OBJE, $<ctxt>$)
+ START(OBJE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>6,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>6,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2915,13
+3028,13
@@
multim_obje_emb_sect : OPEN DELIM TAG_OBJE
{ $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(OBJE, $<ctxt>$)
+ START(OBJE, $
1, $
<ctxt>$)
}
multim_obje_emb_subs
{ CHECK2(FORM,FILE) }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>4,
}
multim_obje_emb_subs
{ CHECK2(FORM,FILE) }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>4,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-2941,13
+3054,14
@@
multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
= start_element(ELT_SUB_MULTIM_OBJE_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_MULTIM_OBJE_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FORM, $<ctxt>$)
+ START(FORM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_FORM,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_FORM,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
}
;
multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
@@
-2955,13
+3069,14
@@
multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
= start_element(ELT_SUB_MULTIM_OBJE_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_MULTIM_OBJE_TITL,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TITL, $<ctxt>$)
+ START(TITL, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_TITL,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_TITL,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
}
;
multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
@@
-2969,13
+3084,14
@@
multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
= start_element(ELT_SUB_MULTIM_OBJE_FILE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_MULTIM_OBJE_FILE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FILE, $<ctxt>$)
+ START(FILE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_FILE,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_MULTIM_OBJE_FILE,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-2993,12
+3109,13
@@
note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
= start_element(ELT_SUB_NOTE,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_NOTE,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(NOTE, $<ctxt>$)
+ START(NOTE, $
1, $
<ctxt>$)
}
note_struc_link_subs
{ CHECK0 }
CLOSE
}
note_struc_link_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_NOTE, PARENT, $<ctxt>6, NULL);
+ { end_element(ELT_SUB_NOTE, PARENT, $<ctxt>6,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3015,12
+3132,17
@@
note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
= start_element(ELT_SUB_NOTE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
= start_element(ELT_SUB_NOTE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
- START(NOTE, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ if ($4)
+ safe_buf_append(&concat_buffer, $4);
+ START(NOTE, $1, $<ctxt>$)
}
note_struc_emb_subs
{ CHECK0 }
CLOSE
}
note_struc_emb_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_NOTE, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SUB_NOTE, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-3041,12
+3163,13
@@
pers_name_sect : OPEN DELIM TAG_NAME mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NAME, $<ctxt>$)
+ START(NAME, $
1, $
<ctxt>$)
}
pers_name_subs
{ CHECK0 }
CLOSE
}
pers_name_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_PERS_NAME, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_PERS_NAME, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3069,78
+3192,78
@@
pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NPFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NPFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NPFX, $<ctxt>$)
+ START(NPFX, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_GIVN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_GIVN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(GIVN, $<ctxt>$)
+ START(GIVN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NICK,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NICK,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NICK, $<ctxt>$)
+ START(NICK, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NICK, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NICK, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SPFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SPFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(SPFX, $<ctxt>$)
+ START(SPFX, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SURN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SURN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(SURN, $<ctxt>$)
+ START(SURN, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_SURN, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_SURN, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NSFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
}
;
pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NSFX,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(NSFX, $<ctxt>$)
+ START(NSFX, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3153,12
+3276,13
@@
place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
= start_element(ELT_SUB_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_PLAC,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PLAC, $<ctxt>$)
+ START(PLAC, $
1, $
<ctxt>$)
}
place_struc_plac_subs
{ CHECK0 }
CLOSE
}
place_struc_plac_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_PLAC, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_PLAC, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3177,13
+3301,13
@@
place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
= start_element(ELT_SUB_PLAC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_PLAC_FORM,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(FORM, $<ctxt>$)
+ START(FORM, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PLAC_FORM, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_PLAC_FORM, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3201,12
+3325,13
@@
source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
= start_element(ELT_SUB_SOUR,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_SOUR,
PARENT, $1, $3, $5,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(SOUR, $<ctxt>$)
+ START(SOUR, $
1, $
<ctxt>$)
}
source_cit_link_subs
{ CHECK0 }
CLOSE
}
source_cit_link_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_SOUR, PARENT, $<ctxt>6, NULL);
+ { end_element(ELT_SUB_SOUR, PARENT, $<ctxt>6,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3228,13
+3353,13
@@
source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
= start_element(ELT_SUB_SOUR_PAGE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_SOUR_PAGE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(PAGE, $<ctxt>$)
+ START(PAGE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_PAGE, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_PAGE, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3243,13
+3368,13
@@
source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item
= start_element(ELT_SUB_SOUR_EVEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_SOUR_EVEN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(EVEN, $<ctxt>$)
+ START(EVEN, $
1, $
<ctxt>$)
}
source_cit_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_EVEN, PARENT, $<ctxt>5,
}
source_cit_even_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_EVEN, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3266,13
+3391,14
@@
source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
= start_element(ELT_SUB_SOUR_EVEN_ROLE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_SOUR_EVEN_ROLE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(ROLE, $<ctxt>$)
+ START(ROLE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_EVEN_ROLE,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_EVEN_ROLE,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3280,13
+3406,13
@@
source_cit_data_sect : OPEN DELIM TAG_DATA
{ $<ctxt>$ = start_element(ELT_SUB_SOUR_DATA,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
{ $<ctxt>$ = start_element(ELT_SUB_SOUR_DATA,
PARENT, $1, $3, NULL,
GEDCOM_MAKE_NULL(val1));
- START(DATA, $<ctxt>$)
+ START(DATA, $
1, $
<ctxt>$)
}
source_cit_data_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_DATA, PARENT, $<ctxt>4,
}
source_cit_data_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_DATA, PARENT, $<ctxt>4,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3305,13
+3431,14
@@
source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
= start_element(ELT_SUB_SOUR_DATA_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
= start_element(ELT_SUB_SOUR_DATA_DATE,
PARENT, $1, $3, $4,
GEDCOM_MAKE_DATE(val1, dv));
- START(DATE, $<ctxt>$)
+ START(DATE, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_DATA_DATE,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_DATA_DATE,
- PARENT, $<ctxt>5, NULL);
+ PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3320,13
+3447,16
@@
source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item
= start_element(ELT_SUB_SOUR_TEXT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_SOUR_TEXT,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(TEXT, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(TEXT, $1, $<ctxt>$)
}
source_cit_text_subs
{ CHECK0 }
CLOSE
}
source_cit_text_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_SOUR_TEXT, PARENT, $<ctxt>5,
- NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SUB_SOUR_TEXT, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-3343,13
+3473,13
@@
source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
= start_element(ELT_SUB_SOUR_QUAY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
= start_element(ELT_SUB_SOUR_QUAY,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(QUAY, $<ctxt>$)
+ START(QUAY, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_QUAY, PARENT, $<ctxt>5,
}
no_std_subs
{ CHECK0 }
CLOSE
{ end_element(ELT_SUB_SOUR_QUAY, PARENT, $<ctxt>5,
-
NULL
);
+
GEDCOM_MAKE_NULL(val1)
);
}
;
}
;
@@
-3357,12
+3487,16
@@
source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_SOUR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_SOUR,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(SOUR, $<ctxt>$)
+ reset_buffer(&concat_buffer);
+ safe_buf_append(&concat_buffer, $4);
+ START(SOUR, $1, $<ctxt>$)
}
source_cit_emb_subs
{ CHECK0 }
CLOSE
}
source_cit_emb_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_SOUR, PARENT, $<ctxt>5, NULL);
+ { char* complete = get_buf_string(&concat_buffer);
+ end_element(ELT_SUB_SOUR, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_STRING(val1, complete));
}
;
}
;
@@
-3388,12
+3522,13
@@
source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
= start_element(ELT_SUB_REPO,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_REPO,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(REPO, $<ctxt>$)
+ START(REPO, $
1, $
<ctxt>$)
}
source_repos_repo_subs
{ CHECK0 }
CLOSE
}
source_repos_repo_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_REPO, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_REPO, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3410,12
+3545,13
@@
caln_sect : OPEN DELIM TAG_CALN mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_REPO_CALN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_REPO_CALN,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(CALN, $<ctxt>$)
+ START(CALN, $
1, $
<ctxt>$)
}
caln_subs
{ CHECK0 }
CLOSE
}
caln_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_REPO_CALN, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_REPO_CALN, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3431,12
+3567,13
@@
caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item
{ $<ctxt>$ = start_element(ELT_SUB_REPO_CALN_MEDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
{ $<ctxt>$ = start_element(ELT_SUB_REPO_CALN_MEDI,
PARENT, $1, $3, $4,
GEDCOM_MAKE_STRING(val1, $4));
- START(MEDI, $<ctxt>$)
+ START(MEDI, $
1, $
<ctxt>$)
}
no_std_subs
{ CHECK0 }
CLOSE
}
no_std_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3452,12
+3589,13
@@
spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer
= start_element(ELT_SUB_FAMS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
= start_element(ELT_SUB_FAMS,
PARENT, $1, $3, $4,
GEDCOM_MAKE_XREF_PTR(val1, xr));
- START(FAMS, $<ctxt>$)
+ START(FAMS, $
1, $
<ctxt>$)
}
spou_fam_fams_subs
{ CHECK0 }
CLOSE
}
spou_fam_fams_subs
{ CHECK0 }
CLOSE
- { end_element(ELT_SUB_FAMS, PARENT, $<ctxt>5, NULL);
+ { end_element(ELT_SUB_FAMS, PARENT, $<ctxt>5,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3479,12
+3617,14
@@
no_std_subs : /* empty */
no_std_sub : user_sect /* 0:M */
| gen_sect
no_std_sub : user_sect /* 0:M */
| gen_sect
- | error error_subs CLOSE { HANDLE_ERROR }
+ | error error_subs
+ CLOSE { HANDLE_ERROR }
;
no_std_rec : user_rec /* 0:M */
| gen_rec
;
no_std_rec : user_rec /* 0:M */
| gen_rec
- | error error_subs CLOSE { HANDLE_ERROR }
+ | error error_subs
+ CLOSE { HANDLE_ERROR }
;
user_rec : OPEN DELIM opt_xref USERTAG
;
user_rec : OPEN DELIM opt_xref USERTAG
@@
-3504,12
+3644,12
@@
user_rec : OPEN DELIM opt_xref USERTAG
$1,
GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr),
$4, $6, &val2);
$1,
GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr),
$4, $6, &val2);
- START($4, $<ctxt>$)
+ START($4, $
1, $
<ctxt>$)
}
user_sects
{ CHECK0 }
CLOSE
}
user_sects
{ CHECK0 }
CLOSE
- { end_record(REC_USER, $<ctxt>7); }
+ { end_record(REC_USER, $<ctxt>7
, GEDCOM_MAKE_NULL(val1)
); }
;
user_sect : OPEN DELIM opt_xref USERTAG
{ if ($4.string[0] != '_') {
;
user_sect : OPEN DELIM opt_xref USERTAG
{ if ($4.string[0] != '_') {
@@
-3520,12
+3660,13
@@
user_sect : OPEN DELIM opt_xref USERTAG
}
opt_value
{ $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2);
}
opt_value
{ $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2);
- START($4, $<ctxt>$);
+ START($4, $
1, $
<ctxt>$);
}
user_sects
{ CHECK0 }
CLOSE
}
user_sects
{ CHECK0 }
CLOSE
- { end_element(ELT_USER, PARENT, $<ctxt>7, NULL);
+ { end_element(ELT_USER, PARENT, $<ctxt>7,
+ GEDCOM_MAKE_NULL(val1));
}
;
}
;
@@
-3573,39
+3714,39
@@
opt_line_item : /* empty */ { $$ = NULL; }
;
line_item : anychar { size_t i;
;
line_item : anychar { size_t i;
- CLEAR_BUFFER(line_item_buf);
- line_item_buf_ptr = line_item_buf;
- /* The following also takes care of '@@' */
+ reset_buffer(&line_item_buffer);
+ /* The following also takes care of '@@' */
if (!strncmp($1, "@@", 3))
if (!strncmp($1, "@@", 3))
- *line_item_buf_ptr++ = '@';
+ SAFE_BUF_ADDCHAR(&line_item_buffer, '@')
else
for (i=0; i < strlen($1); i++)
else
for (i=0; i < strlen($1); i++)
- *line_item_buf_ptr++ = $1[i];
- $$ =
line_item_buf
;
+ SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i])
+ $$ =
get_buf_string(&line_item_buffer)
;
}
| ESCAPE { size_t i;
}
| ESCAPE { size_t i;
- CLEAR_BUFFER(line_item_buf);
- line_item_buf_ptr = line_item_buf;
- for (i=0; i < strlen($1); i++)
- *line_item_buf_ptr++ = $1[i];
- $$ = line_item_buf;
+ reset_buffer(&line_item_buffer);
+ for (i=0; i < strlen($1); i++)
+ SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i])
+ $$ = get_buf_string(&line_item_buffer);
}
| line_item anychar
{ size_t i;
/* The following also takes care of '@@' */
if (!strncmp($2, "@@", 3))
}
| line_item anychar
{ size_t i;
/* The following also takes care of '@@' */
if (!strncmp($2, "@@", 3))
- *line_item_buf_ptr++ = '@';
+ SAFE_BUF_ADDCHAR(&line_item_buffer, '@')
else
for (i=0; i < strlen($2); i++)
else
for (i=0; i < strlen($2); i++)
- *line_item_buf_ptr++ = $2[i];
- $$ =
line_item_buf
;
+ SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i])
+ $$ =
get_buf_string(&line_item_buffer)
;
}
| line_item ESCAPE
{ size_t i;
for (i=0; i < strlen($2); i++)
}
| line_item ESCAPE
{ size_t i;
for (i=0; i < strlen($2); i++)
- *line_item_buf_ptr++ = $2[i];
- $$ =
line_item_buf
;
+ SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i])
+ $$ =
get_buf_string(&line_item_buffer)
;
}
}
+ | line_item error anychar { HANDLE_ERROR; }
+ | line_item error ESCAPE { HANDLE_ERROR; }
;
anychar : ANYCHAR { }
;
anychar : ANYCHAR { }
@@
-3617,6
+3758,7
@@
error_subs : /* empty */
;
error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
;
error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
+ ;
gen_sect : OPEN DELIM opt_xref anystdtag
{ INVALID_TAG($4.string); }
gen_sect : OPEN DELIM opt_xref anystdtag
{ INVALID_TAG($4.string); }
@@
-3785,6
+3927,7
@@
anystdtag : TAG_ABBR
| TAG_VERS { }
| TAG_WIFE { }
| TAG_WILL { }
| TAG_VERS { }
| TAG_WIFE { }
| TAG_WILL { }
+ ;
%%
%%
@@
-3794,14
+3937,20
@@
int* count_arrays[MAXGEDCLEVEL+1];
char tag_stack[MAXGEDCLEVEL+1][MAXSTDTAGLEN+1];
Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1];
char tag_stack[MAXGEDCLEVEL+1][MAXSTDTAGLEN+1];
Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1];
-void push_countarray()
+void push_countarray(
int level
)
{
int *count = NULL;
{
int *count = NULL;
+ gedcom_debug_print("Push Count level: %d, level: %d\n", count_level, level);
+ if (count_level != level + 1) {
+ gedcom_error(_("Internal error: count level mismatch"));
+ exit(1);
+ }
if (count_level > MAXGEDCLEVEL) {
gedcom_error(_("Internal error: count array overflow"));
exit(1);
}
else {
if (count_level > MAXGEDCLEVEL) {
gedcom_error(_("Internal error: count array overflow"));
exit(1);
}
else {
+ gedcom_debug_print("calloc countarray %d\n", count_level);
count = (int *)calloc(YYNTOKENS, sizeof(int));
if (count == NULL) {
gedcom_error(_("Internal error: count array calloc error"));
count = (int *)calloc(YYNTOKENS, sizeof(int));
if (count == NULL) {
gedcom_error(_("Internal error: count array calloc error"));
@@
-3813,7
+3962,7
@@
void push_countarray()
}
}
}
}
-void set_parenttag(char* tag)
+void set_parenttag(c
onst c
har* tag)
{
strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
}
{
strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
}
@@
-3848,17
+3997,38
@@
int check_occurrence(int tag)
void pop_countarray()
{
int *count;
void pop_countarray()
{
int *count;
+ gedcom_debug_print("Pop Count level: %d\n", count_level);
if (count_level < 0) {
gedcom_error(_("Internal error: count array underflow"));
exit(1);
}
else {
count = count_arrays[count_level];
if (count_level < 0) {
gedcom_error(_("Internal error: count array underflow"));
exit(1);
}
else {
count = count_arrays[count_level];
+ gedcom_debug_print("free countarray %d\n", count_level);
free(count);
count_arrays[count_level] = NULL;
}
}
free(count);
count_arrays[count_level] = NULL;
}
}
+void clean_up()
+{
+ gedcom_debug_print("Cleanup countarrays\n");
+ while (count_level > 0) {
+ pop_countarray();
+ --count_level;
+ }
+}
+
+void cleanup_concat_buffer()
+{
+ cleanup_buffer(&concat_buffer);
+}
+
+void cleanup_line_item_buffer()
+{
+ cleanup_buffer(&line_item_buffer);
+}
+
/* Enabling debug mode */
/* level 0: no debugging */
/* level 1: only internal */
/* Enabling debug mode */
/* level 0: no debugging */
/* level 1: only internal */
@@
-3881,7
+4051,7
@@
void gedcom_set_debug_level(int level, FILE* f)
}
}
}
}
-int gedcom_debug_print(char* s, ...)
+int gedcom_debug_print(c
onst c
har* s, ...)
{
int res = 0;
if (gedcom_high_level_debug) {
{
int res = 0;
if (gedcom_high_level_debug) {