+/* This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+
+ (C) 2001 by The Genes Development Team
+ Original author: Peter Verthez (Peter.Verthez@advalvas.be)
+*/
+
/* $Id$ */
/* $Name$ */
/* General notes:
- - The syntax analysis doesn't handle the contents of the line values
- or their encoding; this is done in the semantic analysis.
+ - The syntax analysis doesn't handle the contents of the line values;
+ this is done in the semantic analysis.
*/
%{
#include "gedcom.h"
+#include "multilex.h"
+#include "encoding.h"
+#include "interface.h"
+
+int count_level = 0;
+int fail = 0;
+int compat_enabled = 1;
+int gedcom_high_level_debug = 0;
+int compatibility = 0;
+Gedcom_err_mech error_mechanism = IMMED_FAIL;
+
+char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
+char *line_item_buf_ptr;
-int count_level=0;
-MECHANISM curr_mechanism=FAIL_PARSE;
+enum _COMPAT {
+ C_FTREE = 0x01
+};
/* These are defined at the bottom of the file */
void push_countarray();
void set_parenttag(char* tag);
char* get_parenttag();
+void set_parentctxt(Gedcom_ctxt ctxt);
+Gedcom_ctxt get_parentctxt();
void pop_countarray();
int count_tag(int tag);
int check_occurrence(int tag);
+void set_compatibility(char* program);
+int compat_mode(int flags);
+
+#define CLEAR_BUFFER(BUF) \
+ memset(BUF, 0, sizeof(BUF));
-#define OPEN(PARENTTAG) \
- { ++count_level; \
- set_parenttag(#PARENTTAG); \
- push_countarray(); \
+#define HANDLE_ERROR \
+ { if (error_mechanism == IMMED_FAIL) { \
+ YYABORT; \
+ } \
+ else if (error_mechanism == DEFER_FAIL) { \
+ yyerrok; fail = 1; \
+ } \
+ else if (error_mechanism == IGNORE_ERRORS) { \
+ yyerrok; \
+ } \
+ }
+#define START(PARENTTAG,PARENTCTXT) \
+ { ++count_level; \
+ set_parenttag(#PARENTTAG); \
+ set_parentctxt(PARENTCTXT); \
+ push_countarray(); \
}
-#define CHK(TAG) \
- { if (!check_occurrence(TAG_##TAG)) { \
- char* parenttag = get_parenttag(); \
- gedcom_error("The tag '%s' is mandatory within '%s'", \
- #TAG, parenttag); \
- YYERROR; \
- } \
+#define PARENT \
+ get_parentctxt()
+#define CHK(TAG) \
+ { if (!check_occurrence(TAG_##TAG)) { \
+ char* parenttag = get_parenttag(); \
+ gedcom_error("The tag '%s' is mandatory within '%s', but missing", \
+ #TAG, parenttag); \
+ HANDLE_ERROR; \
+ } \
}
-#define POP \
- { pop_countarray(); \
- --count_level; \
+#define POP \
+ { pop_countarray(); \
+ --count_level; \
}
#define CHECK0 POP;
#define CHECK1(TAG1) { CHK(TAG1); POP; }
-#define CHECK2(TAG1,TAG2) \
+#define CHECK2(TAG1,TAG2) \
{ CHK(TAG1); CHK(TAG2); POP; }
-#define CHECK3(TAG1,TAG2,TAG3) \
+#define CHECK3(TAG1,TAG2,TAG3) \
{ CHK(TAG1); CHK(TAG2); CHK(TAG3); POP; }
-#define CHECK4(TAG1,TAG2,TAG3,TAG4) \
+#define CHECK4(TAG1,TAG2,TAG3,TAG4) \
{ CHK(TAG1); CHK(TAG2); CHK(TAG3); CHK(TAG4); POP; }
#define OCCUR1(CHILDTAG, MIN) { count_tag(TAG_##CHILDTAG); }
-#define OCCUR2(CHILDTAG, MIN, MAX) \
- { int num = count_tag(TAG_##CHILDTAG); \
- if (num > MAX) { \
- char* parenttag = get_parenttag(); \
- gedcom_error("The tag '%s' can maximally occur %d " \
- "time(s) within '%s'", \
- #CHILDTAG, MAX, parenttag); \
- YYERROR; \
- } \
+#define OCCUR2(CHILDTAG, MIN, MAX) \
+ { int num = count_tag(TAG_##CHILDTAG); \
+ if (num > MAX) { \
+ char* parenttag = get_parenttag(); \
+ gedcom_error("The tag '%s' can maximally occur %d " \
+ "time(s) within '%s'", \
+ #CHILDTAG, MAX, parenttag); \
+ HANDLE_ERROR; \
+ } \
}
-#define INVALID_TAG(CHILDTAG) \
- { char* parenttag = get_parenttag(); \
- gedcom_error("The tag '%s' is not a valid tag within '%s'", \
- CHILDTAG, parenttag); \
- YYERROR; \
+#define INVALID_TAG(CHILDTAG) \
+ { char* parenttag = get_parenttag(); \
+ gedcom_error("The tag '%s' is not a valid tag within '%s'", \
+ CHILDTAG, parenttag); \
+ HANDLE_ERROR; \
}
-#define INVALID_TOP_TAG(CHILDTAG) \
- { gedcom_error("The tag '%s' is not a valid top-level tag", \
+#define INVALID_TOP_TAG(CHILDTAG) \
+ { gedcom_error("The tag '%s' is not a valid top-level tag", \
CHILDTAG); \
- YYERROR; \
+ HANDLE_ERROR; \
}
%}
%union {
+ int number;
char *string;
+ Gedcom_ctxt ctxt;
}
%token_table
+%expect 300
%token <string> BADTOKEN
-%token <string> OPEN
+%token <number> OPEN
%token <string> CLOSE
%token <string> ESCAPE
%token <string> DELIM
%token <string> TAG_WIFE
%token <string> TAG_WILL
-/*
-%type <string> anytag
-*/
+%type <string> anystdtag
+%type <string> anytoptag
+%type <string> line_item
+%type <string> line_value
+%type <string> mand_line_item
+%type <string> mand_pointer
+%type <string> note_line_item
+%type <string> anychar
+%type <string> opt_xref
+%type <string> opt_value
+%type <ctxt> head_sect
%%
-file : head_sect records trlr_sect { }
+file : head_sect records trlr_sect
+ { if (fail == 1) YYABORT; }
;
records : /* empty */
| source_rec
| submis_rec
| submit_rec
- | user_sect /* 0:M */
- ;
+ | no_std_rec
+ ;
/*********************************************************************/
/**** Header ****/
/*********************************************************************/
head_sect : OPEN DELIM TAG_HEAD
- { OPEN(HEAD) }
+ { $<ctxt>$ = start_record(REC_HEAD, $1, NULL, $3);
+ START(HEAD, $<ctxt>$) }
head_subs
- { CHECK4(SOUR, SUBM, GEDC, CHAR) }
- CLOSE { }
+ { if (compat_mode(C_FTREE))
+ CHECK3(SOUR, GEDC, CHAR)
+ else
+ CHECK4(SOUR, SUBM, GEDC, CHAR)
+ }
+ CLOSE
+ { end_record(REC_HEAD, $<ctxt>4); }
;
head_subs : /* empty */
| head_lang_sect { OCCUR2(LANG, 0, 1) }
| head_plac_sect { OCCUR2(PLAC, 0, 1) }
| head_note_sect { OCCUR2(NOTE, 0, 1) }
- | user_sect /* 0:M */
+ | no_std_sub
;
/* HEAD.SOUR */
-head_sour_sect : OPEN DELIM TAG_SOUR DELIM line_item
- { OPEN(SOUR) }
+head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
+ { set_compatibility($4);
+ $<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
+ $1, $3, $4, $4);
+ START(SOUR, $<ctxt>$)
+ }
head_sour_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5, NULL); }
;
head_sour_subs : /* empty */
| head_sour_name_sect { OCCUR2(NAME, 0, 1) }
| head_sour_corp_sect { OCCUR2(CORP, 0, 1) }
| head_sour_data_sect { OCCUR2(DATA, 0, 1) }
+ | no_std_sub
;
-head_sour_vers_sect : OPEN DELIM TAG_VERS DELIM line_item CLOSE
- { }
+
+head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_VERS, PARENT,
+ $1, $3, $4, $4);
+ START(VERS, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SOUR_VERS,
+ PARENT, $<ctxt>5, NULL);
+ }
;
-head_sour_name_sect : OPEN DELIM TAG_NAME DELIM line_item CLOSE
- { }
+head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_NAME, PARENT,
+ $1, $3, $4, $4);
+ START(NAME, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SOUR_NAME,
+ PARENT, $<ctxt>5, NULL);
+ }
;
-head_sour_corp_sect : OPEN DELIM TAG_CORP DELIM line_item
- { OPEN(CORP) }
+head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_CORP, PARENT,
+ $1, $3, $4, $4);
+ START(CORP, $<ctxt>$)
+ }
head_sour_corp_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_SOUR_CORP,
+ PARENT, $<ctxt>5, NULL);
+ }
;
head_sour_corp_subs : /* empty */
;
head_sour_corp_sub : addr_struc_sub /* 0:1 */
+ | no_std_sub
;
-head_sour_data_sect : OPEN DELIM TAG_DATA DELIM line_item
- { OPEN(DATA) }
+head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA, PARENT,
+ $1, $3, $4, $4);
+ START(DATA, $<ctxt>$)
+ }
head_sour_data_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_SOUR_DATA,
+ PARENT, $<ctxt>5, NULL);
+ }
;
head_sour_data_subs : /* empty */
head_sour_data_sub : head_sour_data_date_sect { OCCUR2(DATE, 0, 1) }
| head_sour_data_copr_sect { OCCUR2(COPR, 0, 1) }
+ | no_std_sub
;
-head_sour_data_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE
- { }
+head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_DATE,
+ PARENT, $1, $3, $4, $4);
+ START(DATE, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SOUR_DATA_DATE,
+ PARENT, $<ctxt>5, NULL);
+ }
;
-head_sour_data_copr_sect : OPEN DELIM TAG_COPR DELIM line_item CLOSE
- { }
+head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_COPR,
+ PARENT, $1, $3, $4, $4);
+ START(COPR, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SOUR_DATA_COPR,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.DEST */
-head_dest_sect : OPEN DELIM TAG_DEST DELIM line_item CLOSE
- { }
+head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_DEST,
+ PARENT, $1, $3, $4, $4);
+ START(DEST, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_DEST,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.DATE */
-head_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) }
+head_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_DATE,
+ PARENT, $1, $3, $4, $4);
+ START(DATE, $<ctxt>$)
+ }
head_date_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_DATE,
+ PARENT, $<ctxt>5, NULL);
+ }
;
head_date_subs : /* empty */
;
head_date_sub : head_date_time_sect { OCCUR2(TIME, 0, 1) }
+ | no_std_sub
;
-head_date_time_sect : OPEN DELIM TAG_TIME DELIM line_item CLOSE
- { }
+head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_DATE_TIME,
+ PARENT, $1, $3, $4, $4);
+ START(TIME, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_DATE_TIME,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.SUBM */
-head_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER CLOSE
- { }
+head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { $<ctxt>$ = start_element(ELT_HEAD_SUBM,
+ PARENT, $1, $3, $4, $4);
+ START(SUBM, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SUBM,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.SUBN */
-head_subn_sect : OPEN DELIM TAG_SUBN DELIM POINTER CLOSE
- { }
+head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
+ { $<ctxt>$ = start_element(ELT_HEAD_SUBN,
+ PARENT, $1, $3, $4, $4);
+ START(SUBN, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_SUBN,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.FILE */
-head_file_sect : OPEN DELIM TAG_FILE DELIM line_item CLOSE
- { }
+head_file_sect : OPEN DELIM TAG_FILE mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_FILE,
+ PARENT, $1, $3, $4, $4);
+ START(FILE, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_FILE, PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.COPR */
-head_copr_sect : OPEN DELIM TAG_COPR DELIM line_item CLOSE
- { }
+head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_COPR,
+ PARENT, $1, $3, $4, $4);
+ START(COPR, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_COPR, PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.GEDC */
head_gedc_sect : OPEN DELIM TAG_GEDC
- { OPEN(GEDC) }
+ { $<ctxt>$ = start_element(ELT_HEAD_GEDC,
+ PARENT, $1, $3, NULL, NULL);
+ START(GEDC, $<ctxt>$)
+ }
head_gedc_subs
{ CHECK2(VERS, FORM) }
CLOSE
- { }
+ { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4, NULL);
+ }
;
head_gedc_subs : /* empty */
head_gedc_sub : head_gedc_vers_sect { OCCUR2(VERS, 1, 1) }
| head_gedc_form_sect { OCCUR2(FORM, 1, 1) }
- ;
-head_gedc_vers_sect : OPEN DELIM TAG_VERS DELIM line_item CLOSE
- { }
+ | no_std_sub
+ ;
+head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_GEDC_VERS,
+ PARENT, $1, $3, $4, $4);
+ START(VERS, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_GEDC_VERS,
+ PARENT, $<ctxt>5, NULL);
+ }
;
-head_gedc_form_sect : OPEN DELIM TAG_FORM DELIM line_item CLOSE
- { }
+head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_GEDC_FORM,
+ PARENT, $1, $3, $4, $4);
+ START(FORM, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_GEDC_FORM,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.CHAR */
-head_char_sect : OPEN DELIM TAG_CHAR DELIM line_item
- { OPEN(CHAR) }
+head_char_sect : OPEN DELIM TAG_CHAR mand_line_item
+ { if (open_conv_to_internal($4) == 0) YYERROR;
+ $<ctxt>$ = start_element(ELT_HEAD_CHAR,
+ PARENT, $1, $3, $4, $4);
+ START(CHAR, $<ctxt>$)
+ }
head_char_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_CHAR, PARENT, $<ctxt>5, NULL);
+ }
;
head_char_subs : /* empty */
;
head_char_sub : head_char_vers_sect { OCCUR2(VERS, 0, 1) }
- ;
-head_char_vers_sect : OPEN DELIM TAG_VERS DELIM line_item CLOSE
- { }
+ | no_std_sub
+ ;
+head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_CHAR_VERS,
+ PARENT, $1, $3, $4, $4);
+ START(VERS, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_CHAR_VERS,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.LANG */
-head_lang_sect : OPEN DELIM TAG_LANG DELIM line_item CLOSE
- { }
+head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_LANG,
+ PARENT, $1, $3, $4, $4);
+ START(LANG, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_LANG, PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.PLAC */
head_plac_sect : OPEN DELIM TAG_PLAC
- { OPEN(PLAC) }
+ { $<ctxt>$ = start_element(ELT_HEAD_PLAC,
+ PARENT, $1, $3, NULL, NULL);
+ START(PLAC, $<ctxt>$)
+ }
head_plac_subs
{ CHECK1(FORM) }
CLOSE
- { }
+ { end_element(ELT_HEAD_PLAC, PARENT, $<ctxt>4, NULL);
+ }
;
head_plac_subs : /* empty */
;
head_plac_sub : head_plac_form_sect { OCCUR2(FORM, 1, 1) }
- ;
-head_plac_form_sect : OPEN DELIM TAG_FORM DELIM line_item CLOSE
- { }
+ | no_std_sub
+ ;
+head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_PLAC_FORM,
+ PARENT, $1, $3, $4, $4);
+ START(FORM, $<ctxt>$)
+ }
+ no_std_subs
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_HEAD_PLAC_FORM,
+ PARENT, $<ctxt>5, NULL);
+ }
;
/* HEAD.NOTE */
-head_note_sect : OPEN DELIM TAG_NOTE DELIM line_item
- { OPEN(NOTE) }
+head_note_sect : OPEN DELIM TAG_NOTE mand_line_item
+ { $<ctxt>$ = start_element(ELT_HEAD_NOTE,
+ PARENT, $1, $3, $4, $4);
+ START(NOTE, $<ctxt>$)
+ }
head_note_subs
{ CHECK0 }
CLOSE
- { }
+ { end_element(ELT_HEAD_NOTE, PARENT, $<ctxt>5, NULL);
+ }
;
head_note_subs : /* empty */
;
head_note_sub : continuation_sub /* 0:M */
+ | no_std_sub
;
/*********************************************************************/
/**** Trailer ****/
/*********************************************************************/
+/* Don't need callbacks here, there is no information... */
trlr_sect : OPEN DELIM TAG_TRLR CLOSE { }
;
/**** Family record ****/
/*********************************************************************/
fam_rec : OPEN DELIM POINTER DELIM TAG_FAM
- { OPEN(FAM) }
+ { $<ctxt>$ = start_record(REC_FAM, $1, $3, $5);
+ START(FAM, $<ctxt>$) }
fam_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_FAM, $<ctxt>6); }
;
fam_subs : /* empty */
| note_struc_sub /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/* FAM.HUSB */
-fam_husb_sect : OPEN DELIM TAG_HUSB DELIM POINTER CLOSE
+fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
+ { START(HUSB, NULL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.WIFE */
-fam_wife_sect : OPEN DELIM TAG_WIFE DELIM POINTER CLOSE
+fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
+ { START(WIFE, NULL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.CHIL */
-fam_chil_sect : OPEN DELIM TAG_CHIL DELIM POINTER CLOSE
+fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
+ { START(CHIL, NULL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.NCHI */
-fam_nchi_sect : OPEN DELIM TAG_NCHI DELIM line_item CLOSE
+fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
+ { START(NCHI, NULL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.SUBM */
-fam_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER CLOSE
+fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM, NULL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/**** Individual record ****/
/*********************************************************************/
indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI
- { OPEN(INDI) }
+ { $<ctxt>$ = start_record(REC_INDI, $1, $3, $5);
+ START(INDI, $<ctxt>$) }
indi_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_INDI, $<ctxt>6); }
;
indi_subs : /* empty */
| indi_afn_sect /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | ftree_addr_sect { if (!compat_mode(C_FTREE))
+ INVALID_TAG("ADDR");
+ }
+ | no_std_sub
;
/* INDI.RESN */
-indi_resn_sect : OPEN DELIM TAG_RESN DELIM line_item CLOSE { }
+indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
+ { START(RESN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.SEX */
-indi_sex_sect : OPEN DELIM TAG_SEX DELIM line_item CLOSE { }
+indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item
+ { START(SEX, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.SUBM */
-indi_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER CLOSE { }
+indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.ALIA */
-indi_alia_sect : OPEN DELIM TAG_ALIA DELIM POINTER CLOSE { }
+indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
+ { START(ALIA, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.ANCI */
-indi_anci_sect : OPEN DELIM TAG_ANCI DELIM POINTER CLOSE { }
+indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
+ { START(ANCI, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.DESI */
-indi_desi_sect : OPEN DELIM TAG_DESI DELIM POINTER CLOSE { }
+indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
+ { START(DESI, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.RFN */
-indi_rfn_sect : OPEN DELIM TAG_RFN DELIM line_item CLOSE { }
+indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
+ { START(RFN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.AFN */
-indi_afn_sect : OPEN DELIM TAG_AFN DELIM line_item CLOSE { }
+indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item
+ { START(AFN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
+/* INDI.ADDR (Only for 'ftree' compatibility) */
+ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
+ { START(ADDR, NULL) } no_std_subs { CHECK0 } CLOSE { }
+
/*********************************************************************/
/**** Multimedia record ****/
/*********************************************************************/
multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE
- { OPEN(OBJE) }
+ { $<ctxt>$ = start_record(REC_OBJE, $1, $3, $5);
+ START(OBJE, $<ctxt>$) }
obje_subs
{ CHECK2(FORM, BLOB) }
- CLOSE { }
+ CLOSE
+ { end_record(REC_OBJE, $<ctxt>6); }
;
obje_subs : /* empty */
| obje_obje_sect { OCCUR2(OBJE, 0, 1) }
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/* OBJE.FORM */
-obje_form_sect : OPEN DELIM TAG_FORM DELIM line_item CLOSE { }
+obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.TITL */
-obje_titl_sect : OPEN DELIM TAG_TITL DELIM line_item CLOSE { }
+obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.BLOB */
obje_blob_sect : OPEN DELIM TAG_BLOB
- { OPEN(BLOB) }
+ { START(BLOB, NULL) }
obje_blob_subs
{ CHECK1(CONT) }
CLOSE { }
;
obje_blob_sub : obje_blob_cont_sect { OCCUR1(CONT, 1) }
+ | no_std_sub
;
-obje_blob_cont_sect : OPEN DELIM TAG_CONT DELIM line_item CLOSE { }
+obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.OBJE */
-obje_obje_sect : OPEN DELIM TAG_OBJE DELIM POINTER CLOSE { }
+obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
+ { START(OBJE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/*********************************************************************/
/**** Note record ****/
/*********************************************************************/
-note_rec : OPEN DELIM POINTER DELIM TAG_NOTE DELIM line_item
- { OPEN(NOTE) }
+note_rec : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
+ { $<ctxt>$ = start_record(REC_NOTE, $1, $3, $5);
+ START(NOTE, $<ctxt>$) }
note_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_NOTE, $<ctxt>6); }
;
+note_line_item : /* empty */
+ { if (!compat_mode(C_FTREE)) {
+ gedcom_error("Missing value"); YYERROR;
+ }
+ }
+ | DELIM line_item
+ { gedcom_debug_print("==Val: %s==\n", $2);
+ $$ = $2; }
+ ;
+
note_subs : /* empty */
| note_subs note_sub
;
| source_cit_sub /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/*********************************************************************/
/**** Repository record ****/
/*********************************************************************/
repos_rec : OPEN DELIM POINTER DELIM TAG_REPO
- { OPEN(REPO) }
+ { $<ctxt>$ = start_record(REC_REPO, $1, $3, $5);
+ START(REPO, $<ctxt>$) }
repo_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_REPO, $<ctxt>6); }
;
repo_subs : /* empty */
| note_struc_sub /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/* REPO.NAME */
-repo_name_sect : OPEN DELIM TAG_NAME DELIM line_item CLOSE {}
+repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME, NULL) } no_std_subs { CHECK0 } CLOSE {}
;
/*********************************************************************/
/**** Source record ****/
/*********************************************************************/
source_rec : OPEN DELIM POINTER DELIM TAG_SOUR
- { OPEN(SOUR) }
+ { $<ctxt>$ = start_record(REC_SOUR, $1, $3, $5);
+ START(SOUR, $<ctxt>$) }
sour_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_SOUR, $<ctxt>6); }
;
sour_subs : /* empty */
| note_struc_sub /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/* SOUR.DATA */
sour_data_sect : OPEN DELIM TAG_DATA
- { OPEN(DATA) }
+ { START(DATA, NULL) }
sour_data_subs
{ CHECK0 }
CLOSE { }
sour_data_sub : sour_data_even_sect /* 0:M */
| sour_data_agnc_sect { OCCUR2(AGNC, 0, 1) }
| note_struc_sub /* 0:M */
+ | no_std_sub
;
-sour_data_even_sect : OPEN DELIM TAG_EVEN DELIM line_item
- { OPEN(EVEN) }
+sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item
+ { START(EVEN, NULL) }
sour_data_even_subs
{ CHECK0 }
CLOSE { }
sour_data_even_sub : sour_data_even_date_sect { OCCUR2(DATE, 0, 1) }
| sour_data_even_plac_sect { OCCUR2(PLAC, 0, 1) }
+ | no_std_sub
;
-sour_data_even_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE { }
+sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-sour_data_even_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item CLOSE { }
+sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-sour_data_agnc_sect : OPEN DELIM TAG_AGNC DELIM line_item CLOSE { }
+sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
+ { START(AGNC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SOUR.AUTH */
-sour_auth_sect : OPEN DELIM TAG_AUTH DELIM line_item
- { OPEN(AUTH) }
+sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item
+ { START(AUTH, NULL) }
sour_auth_subs
{ CHECK0 }
CLOSE { }
;
sour_auth_sub : continuation_sub /* 0:M */
+ | no_std_sub
;
/* SOUR.TITL */
-sour_titl_sect : OPEN DELIM TAG_TITL DELIM line_item
- { OPEN(TITL) }
+sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL, NULL) }
sour_titl_subs
{ CHECK0 }
CLOSE { }
;
sour_titl_sub : continuation_sub /* 0:M */
+ | no_std_sub
;
/* SOUR.ABBR */
-sour_abbr_sect : OPEN DELIM TAG_ABBR DELIM line_item CLOSE { }
+sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
+ { START(ABBR, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SOUR.PUBL */
-sour_publ_sect : OPEN DELIM TAG_PUBL DELIM line_item
- { OPEN(PUBL) }
+sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item
+ { START(PUBL, NULL) }
sour_publ_subs
{ CHECK0 }
CLOSE { }
;
sour_publ_sub : continuation_sub /* 0:M */
+ | no_std_sub
;
/* SOUR.TEXT */
-sour_text_sect : OPEN DELIM TAG_TEXT DELIM line_item
- { OPEN(TEXT) }
+sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item
+ { START(TEXT, NULL) }
sour_text_subs
{ CHECK0 }
CLOSE { }
;
sour_text_sub : continuation_sub /* 0:M */
+ | no_std_sub
;
/*********************************************************************/
/**** Submission record ****/
/*********************************************************************/
submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN
- { OPEN(SUBN) }
+ { $<ctxt>$ = start_record(REC_SUBN, $1, $3, $5);
+ START(SUBN, $<ctxt>$) }
subn_subs
{ CHECK0 }
- CLOSE { }
+ CLOSE
+ { end_record(REC_SUBN, $<ctxt>6); }
;
subn_subs : /* empty */
| subn_desc_sect { OCCUR2(DESC, 0, 1) }
| subn_ordi_sect { OCCUR2(ORDI, 0, 1) }
| subn_rin_sect { OCCUR2(RIN, 0, 1) }
- | user_sect /* 0:M */
+ | no_std_sub
;
/* SUBN.SUBM */
-subn_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER CLOSE { }
+subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.FAMF */
-subn_famf_sect : OPEN DELIM TAG_FAMF DELIM line_item CLOSE { }
+subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
+ { START(FAMF, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.TEMP */
-subn_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item CLOSE { }
+subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.ANCE */
-subn_ance_sect : OPEN DELIM TAG_ANCE DELIM line_item CLOSE { }
+subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
+ { START(ANCE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.DESC */
-subn_desc_sect : OPEN DELIM TAG_DESC DELIM line_item CLOSE { }
+subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
+ { START(DESC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.ORDI */
-subn_ordi_sect : OPEN DELIM TAG_ORDI DELIM line_item CLOSE { }
+subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
+ { START(ORDI, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.RIN */
-subn_rin_sect : OPEN DELIM TAG_RIN DELIM line_item CLOSE { }
+subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/*********************************************************************/
/**** Submitter record ****/
/*********************************************************************/
submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM
- { OPEN(SUBM) }
+ { $<ctxt>$ = start_record(REC_SUBM, $1, $3, $5);
+ START(SUBM, $<ctxt>$) }
subm_subs
{ CHECK1(NAME) }
- CLOSE { }
+ CLOSE
+ { end_record(REC_SUBM, $<ctxt>6); }
;
subm_subs : /* empty */
| subm_rfn_sect { OCCUR2(RFN, 0, 1) }
| subm_rin_sect { OCCUR2(RIN, 0, 1) }
| change_date_sub /* 0:1 */
- | user_sect /* 0:M */
+ | no_std_sub
;
/* SUBM.NAME */
-subm_name_sect : OPEN DELIM TAG_NAME DELIM line_item CLOSE { }
+subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.LANG */
-subm_lang_sect : OPEN DELIM TAG_LANG DELIM line_item CLOSE { }
+subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
+ { START(LANG, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.RFN */
-subm_rfn_sect : OPEN DELIM TAG_RFN DELIM line_item CLOSE { }
+subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
+ { START(RFN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.RIN */
-subm_rin_sect : OPEN DELIM TAG_RIN DELIM line_item CLOSE { }
+subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/*********************************************************************/
| phon_sect { OCCUR2(PHON, 0, 3) }
;
-addr_sect : OPEN DELIM TAG_ADDR DELIM line_item
- { OPEN(ADDR) }
+addr_sect : OPEN DELIM TAG_ADDR mand_line_item
+ { START(ADDR, NULL) }
addr_subs
{ CHECK0 }
CLOSE { }
| addr_stae_sect { OCCUR2(STAE, 0, 1) }
| addr_post_sect { OCCUR2(POST, 0, 1) }
| addr_ctry_sect { OCCUR2(CTRY, 0, 1) }
+ | no_std_sub
;
-addr_cont_sect : OPEN DELIM TAG_CONT DELIM line_item CLOSE { }
+addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_adr1_sect : OPEN DELIM TAG_ADR1 DELIM line_item CLOSE { }
+addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
+ { START(ADR1, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_adr2_sect : OPEN DELIM TAG_ADR2 DELIM line_item CLOSE { }
+addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
+ { START(ADR2, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_city_sect : OPEN DELIM TAG_CITY DELIM line_item CLOSE { }
+addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
+ { START(CITY, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_stae_sect : OPEN DELIM TAG_STAE DELIM line_item CLOSE { }
+addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
+ { START(STAE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_post_sect : OPEN DELIM TAG_POST DELIM line_item CLOSE { }
+addr_post_sect : OPEN DELIM TAG_POST mand_line_item
+ { START(POST, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_ctry_sect : OPEN DELIM TAG_CTRY DELIM line_item CLOSE { }
+addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
+ { START(CTRY, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-phon_sect : OPEN DELIM TAG_PHON DELIM line_item CLOSE { }
+phon_sect : OPEN DELIM TAG_PHON mand_line_item
+ { START(PHON, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* ASSOCIATION STRUCTURE */
assoc_struc_sub : asso_sect /* 0:M */
;
-asso_sect : OPEN DELIM TAG_ASSO DELIM POINTER
- { OPEN(ASSO) }
+asso_sect : OPEN DELIM TAG_ASSO mand_pointer
+ { START(ASSO, NULL) }
asso_subs
{ CHECK2(TYPE,RELA) }
CLOSE { }
| asso_rela_sect { OCCUR2(RELA, 1, 1) }
| note_struc_sub
| source_cit_sub
+ | no_std_sub
;
-asso_type_sect : OPEN DELIM TAG_TYPE DELIM line_item CLOSE { }
+asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-asso_rela_sect : OPEN DELIM TAG_RELA DELIM line_item CLOSE { }
+asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item
+ { START(RELA, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* CHANGE DATE */
;
change_date_chan_sect : OPEN DELIM TAG_CHAN
- { OPEN(CHAN) }
+ { START(CHAN, NULL) }
change_date_chan_subs
{ CHECK1(DATE) }
CLOSE { }
change_date_chan_sub : change_date_date_sect { OCCUR2(DATE, 1, 1) }
| note_struc_sub
+ | no_std_sub
;
-change_date_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) }
+change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) }
change_date_date_subs
{ CHECK0 }
CLOSE { }
;
change_date_date_sub : change_date_date_time_sect { OCCUR2(TIME, 0, 1) }
+ | no_std_sub
;
-change_date_date_time_sect : OPEN DELIM TAG_TIME DELIM line_item CLOSE { }
+change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
+ { START(TIME, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* CHILD TO FAMILY LINK */
chi_fam_link_sub : famc_sect /* 0:M */
;
-famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER
- { OPEN(FAMC) }
+famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC, NULL) }
famc_subs
{ CHECK0 }
CLOSE { }
famc_sub : famc_pedi_sect /* 0:M */
| note_struc_sub
+ | no_std_sub
;
-famc_pedi_sect : OPEN DELIM TAG_PEDI DELIM line_item CLOSE { }
+famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item
+ { START(PEDI, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* CONTINUATION SUBSECTIONS */
| conc_sect /* 0:M */
;
-cont_sect : OPEN DELIM TAG_CONT DELIM line_item CLOSE { }
+cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-conc_sect : OPEN DELIM TAG_CONC DELIM line_item CLOSE { }
+conc_sect : OPEN DELIM TAG_CONC mand_line_item
+ { START(CONC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* EVENT DETAIL */
| note_struc_sub
;
-event_detail_type_sect : OPEN DELIM TAG_TYPE DELIM line_item CLOSE { }
+event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE { }
+event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_age_sect : OPEN DELIM TAG_AGE DELIM line_item CLOSE { }
+event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item
+ { START(AGE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_agnc_sect : OPEN DELIM TAG_AGNC DELIM line_item CLOSE { }
+event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
+ { START(AGNC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_caus_sect : OPEN DELIM TAG_CAUS DELIM line_item CLOSE { }
+event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
+ { START(CAUS, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* FAMILY EVENT STRUCTURE */
CLOSE { }
;
-fam_event_tag : TAG_ANUL { OPEN(ANUL) }
- | TAG_CENS { OPEN(CENS) }
- | TAG_DIV { OPEN(DIV) }
- | TAG_DIVF { OPEN(DIVF) }
- | TAG_ENGA { OPEN(ENGA) }
- | TAG_MARR { OPEN(MARR) }
- | TAG_MARB { OPEN(MARB) }
- | TAG_MARC { OPEN(MARC) }
- | TAG_MARL { OPEN(MARL) }
- | TAG_MARS { OPEN(MARS) }
+fam_event_tag : TAG_ANUL { START(ANUL, NULL) }
+ | TAG_CENS { START(CENS, NULL) }
+ | TAG_DIV { START(DIV, NULL) }
+ | TAG_DIVF { START(DIVF, NULL) }
+ | TAG_ENGA { START(ENGA, NULL) }
+ | TAG_MARR { START(MARR, NULL) }
+ | TAG_MARB { START(MARB, NULL) }
+ | TAG_MARC { START(MARC, NULL) }
+ | TAG_MARL { START(MARL, NULL) }
+ | TAG_MARS { START(MARS, NULL) }
;
fam_event_subs : /* empty */
fam_event_sub : event_detail_sub
| fam_even_husb_sect { OCCUR2(HUSB, 0, 1) }
| fam_even_wife_sect { OCCUR2(WIFE, 0, 1) }
+ | no_std_sub
;
fam_even_husb_sect : OPEN DELIM TAG_HUSB
- { OPEN(HUSB) }
+ { START(HUSB, NULL) }
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE { }
;
fam_even_husb_sub : fam_even_husb_age_sect { OCCUR2(AGE, 1, 1) }
+ | no_std_sub
;
-fam_even_husb_age_sect : OPEN DELIM TAG_AGE DELIM line_item CLOSE { }
+fam_even_husb_age_sect : OPEN DELIM TAG_AGE mand_line_item
+ { START(AGE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
fam_even_wife_sect : OPEN DELIM TAG_WIFE
- { OPEN(HUSB) }
+ { START(HUSB, NULL) }
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE { }
;
fam_gen_even_sect : OPEN DELIM TAG_EVEN
- { OPEN(EVEN) }
+ { START(EVEN, NULL) }
fam_gen_even_subs
{ CHECK0 }
CLOSE { }
fam_gen_even_sub : event_detail_sub
| fam_even_husb_sect { OCCUR2(HUSB, 0, 1) }
| fam_even_wife_sect { OCCUR2(WIFE, 0, 1) }
+ | no_std_sub
;
/* IDENTIFICATION STRUCTURE */
| ident_rin_sect { OCCUR2(RIN, 0, 1) }
;
-ident_refn_sect : OPEN DELIM TAG_REFN DELIM line_item
- { OPEN(REFN) }
+ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item
+ { START(REFN, NULL) }
ident_refn_subs
{ CHECK0 }
CLOSE { }
;
ident_refn_sub : ident_refn_type_sect { OCCUR2(TYPE, 0, 1) }
+ | no_std_sub
;
-ident_refn_type_sect : OPEN DELIM TAG_TYPE DELIM line_item CLOSE { }
+ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-ident_rin_sect : OPEN DELIM TAG_RIN DELIM line_item CLOSE { }
+ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDIVIDUAL ATTRIBUTE STRUCTURE */
| indiv_titl_sect /* 0:M */
;
-indiv_cast_sect : OPEN DELIM TAG_CAST DELIM line_item
- { OPEN(CAST) }
+indiv_cast_sect : OPEN DELIM TAG_CAST mand_line_item
+ { START(CAST, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_dscr_sect : OPEN DELIM TAG_DSCR DELIM line_item
- { OPEN(DSCR) }
+indiv_dscr_sect : OPEN DELIM TAG_DSCR mand_line_item
+ { START(DSCR, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_educ_sect : OPEN DELIM TAG_EDUC DELIM line_item
- { OPEN(EDUC) }
+indiv_educ_sect : OPEN DELIM TAG_EDUC mand_line_item
+ { START(EDUC, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_idno_sect : OPEN DELIM TAG_IDNO DELIM line_item
- { OPEN(IDNO) }
+indiv_idno_sect : OPEN DELIM TAG_IDNO mand_line_item
+ { START(IDNO, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_nati_sect : OPEN DELIM TAG_NATI DELIM line_item
- { OPEN(NATI) }
+indiv_nati_sect : OPEN DELIM TAG_NATI mand_line_item
+ { START(NATI, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_nchi_sect : OPEN DELIM TAG_NCHI DELIM line_item
- { OPEN(NCHI) }
+indiv_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
+ { START(NCHI, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_nmr_sect : OPEN DELIM TAG_NMR DELIM line_item
- { OPEN(NMR) }
+indiv_nmr_sect : OPEN DELIM TAG_NMR mand_line_item
+ { START(NMR, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_occu_sect : OPEN DELIM TAG_OCCU DELIM line_item
- { OPEN(OCCU) }
+indiv_occu_sect : OPEN DELIM TAG_OCCU mand_line_item
+ { START(OCCU, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_prop_sect : OPEN DELIM TAG_PROP DELIM line_item
- { OPEN(PROP) }
+indiv_prop_sect : OPEN DELIM TAG_PROP mand_line_item
+ { START(PROP, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_reli_sect : OPEN DELIM TAG_RELI DELIM line_item
- { OPEN(RELI) }
+indiv_reli_sect : OPEN DELIM TAG_RELI mand_line_item
+ { START(RELI, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
indiv_resi_sect : OPEN DELIM TAG_RESI
- { OPEN(RESI) }
+ { START(RESI, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_ssn_sect : OPEN DELIM TAG_SSN DELIM line_item
- { OPEN(SSN) }
+indiv_ssn_sect : OPEN DELIM TAG_SSN mand_line_item
+ { START(SSN, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
-indiv_titl_sect : OPEN DELIM TAG_TITL DELIM line_item
- { OPEN(TITL) }
+indiv_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL, NULL) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
indiv_attr_event_sub : event_detail_sub
+ | no_std_sub
;
/* INDIVIDUAL EVENT STRUCTURE */
CLOSE { }
;
-indiv_birt_tag : TAG_BIRT { OPEN(BIRT) }
- | TAG_CHR { OPEN(CHR) }
+indiv_birt_tag : TAG_BIRT { START(BIRT, NULL) }
+ | TAG_CHR { START(CHR, NULL) }
;
indiv_birt_subs : /* empty */
indiv_birt_sub : event_detail_sub
| indiv_birt_famc_sect { OCCUR2(FAMC,0, 1) }
+ | no_std_sub
;
-indiv_birt_famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER CLOSE { }
+indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
indiv_gen_sect : OPEN DELIM indiv_gen_tag opt_value indiv_gen_subs
CLOSE { }
;
-indiv_gen_tag : TAG_DEAT { OPEN(DEAT) }
- | TAG_BURI { OPEN(BURI) }
- | TAG_CREM { OPEN(CREM) }
- | TAG_BAPM { OPEN(BAPM) }
- | TAG_BARM { OPEN(BARM) }
- | TAG_BASM { OPEN(BASM) }
- | TAG_BLES { OPEN(BLES) }
- | TAG_CHRA { OPEN(CHRA) }
- | TAG_CONF { OPEN(CONF) }
- | TAG_FCOM { OPEN(FCOM) }
- | TAG_ORDN { OPEN(ORDN) }
- | TAG_NATU { OPEN(NATU) }
- | TAG_EMIG { OPEN(EMIG) }
- | TAG_IMMI { OPEN(IMMI) }
- | TAG_CENS { OPEN(CENS) }
- | TAG_PROB { OPEN(PROB) }
- | TAG_WILL { OPEN(WILL) }
- | TAG_GRAD { OPEN(GRAD) }
- | TAG_RETI { OPEN(RETI) }
+indiv_gen_tag : TAG_DEAT { START(DEAT, NULL) }
+ | TAG_BURI { START(BURI, NULL) }
+ | TAG_CREM { START(CREM, NULL) }
+ | TAG_BAPM { START(BAPM, NULL) }
+ | TAG_BARM { START(BARM, NULL) }
+ | TAG_BASM { START(BASM, NULL) }
+ | TAG_BLES { START(BLES, NULL) }
+ | TAG_CHRA { START(CHRA, NULL) }
+ | TAG_CONF { START(CONF, NULL) }
+ | TAG_FCOM { START(FCOM, NULL) }
+ | TAG_ORDN { START(ORDN, NULL) }
+ | TAG_NATU { START(NATU, NULL) }
+ | TAG_EMIG { START(EMIG, NULL) }
+ | TAG_IMMI { START(IMMI, NULL) }
+ | TAG_CENS { START(CENS, NULL) }
+ | TAG_PROB { START(PROB, NULL) }
+ | TAG_WILL { START(WILL, NULL) }
+ | TAG_GRAD { START(GRAD, NULL) }
+ | TAG_RETI { START(RETI, NULL) }
;
indiv_gen_subs : /* empty */
;
indiv_gen_sub : event_detail_sub
+ | no_std_sub
;
indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value
- { OPEN(ADOP) }
+ { START(ADOP, NULL) }
indiv_adop_subs
{ CHECK0 }
CLOSE { }
indiv_adop_sub : event_detail_sub
| indiv_adop_famc_sect { OCCUR2(FAMC,0, 1) }
+ | no_std_sub
;
-indiv_adop_famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER
- { OPEN(FAMC) }
+indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC, NULL) }
indiv_adop_famc_subs
{ CHECK0 }
CLOSE { }
;
indiv_adop_famc_sub : indiv_adop_famc_adop_sect { OCCUR2(ADOP,0, 1) }
+ | no_std_sub
;
-indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP DELIM line_item CLOSE { }
+indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
+ { START(ADOP, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
indiv_even_sect : OPEN DELIM TAG_EVEN
- { OPEN(EVEN) }
+ { START(EVEN, NULL) }
indiv_gen_subs
{ CHECK0 }
CLOSE { }
CLOSE { }
;
-lio_bapl_tag : TAG_BAPL { OPEN(BAPL) }
- | TAG_CONL { OPEN(CONL) }
- | TAG_ENDL { OPEN(ENDL) }
+lio_bapl_tag : TAG_BAPL { START(BAPL, NULL) }
+ | TAG_CONL { START(CONL, NULL) }
+ | TAG_ENDL { START(ENDL, NULL) }
;
lio_bapl_subs : /* empty */
| lio_bapl_plac_sect { OCCUR2(PLAC, 0, 1) }
| source_cit_sub
| note_struc_sub
+ | no_std_sub
;
-lio_bapl_stat_sect : OPEN DELIM TAG_STAT DELIM line_item CLOSE { }
+lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item
+ { START(STAT, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE { }
+lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item CLOSE { }
+lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item CLOSE { }
+lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
lio_slgc_sect : OPEN DELIM TAG_SLGC
- { OPEN(SLGC) }
+ { START(SLGC, NULL) }
lio_slgc_subs
{ CHECK1(FAMC) }
CLOSE { }
| lio_slgc_famc_sect { OCCUR2(FAMC, 1, 1) }
;
-lio_slgc_famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER CLOSE { }
+lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* LDS SPOUSE SEALING */
;
lss_slgs_sect : OPEN DELIM TAG_SLGS
- { OPEN(SLGS) }
+ { START(SLGS, NULL) }
lss_slgs_subs
{ CHECK0 }
CLOSE { }
| lss_slgs_plac_sect { OCCUR2(PLAC, 0, 1) }
| source_cit_sub
| note_struc_sub
+ | no_std_sub
;
-lss_slgs_stat_sect : OPEN DELIM TAG_STAT DELIM line_item CLOSE { }
+lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item
+ { START(STAT, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE { }
+lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item CLOSE { }
+lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item CLOSE { }
+lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* MULTIMEDIA LINK */
| multim_obje_emb_sect
;
-multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER CLOSE { }
+multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
+ { START(OBJE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
multim_obje_emb_sect : OPEN DELIM TAG_OBJE
- { OPEN(OBJE) }
+ { START(OBJE, NULL) }
multim_obje_emb_subs
{ CHECK2(FORM,FILE) }
CLOSE { }
| multim_obje_titl_sect { OCCUR2(TITL, 0, 1) }
| multim_obje_file_sect { OCCUR2(FILE, 1, 1) }
| note_struc_sub
+ | no_std_sub
;
-multim_obje_form_sect : OPEN DELIM TAG_FORM DELIM line_item CLOSE { }
+multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-multim_obje_titl_sect : OPEN DELIM TAG_TITL DELIM line_item CLOSE { }
+multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-multim_obje_file_sect : OPEN DELIM TAG_FILE DELIM line_item CLOSE { }
+multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
+ { START(FILE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* NOTE STRUCTURE */
;
note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
- { OPEN(NOTE) }
+ { START(NOTE, NULL) }
note_struc_link_subs
{ CHECK0 }
CLOSE { }
;
note_struc_link_sub : source_cit_sub
+ | no_std_sub
;
note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
- { OPEN(NOTE) }
+ { START(NOTE, NULL) }
note_struc_emb_subs
{ CHECK0 }
CLOSE { }
note_struc_emb_sub : continuation_sub
| source_cit_sub
+ | no_std_sub
;
/* PERSONAL NAME STRUCTURE */
pers_name_struc_sub : pers_name_sect /* 0:M */
;
-pers_name_sect : OPEN DELIM TAG_NAME DELIM line_item
- { OPEN(NAME) }
+pers_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME, NULL) }
pers_name_subs
{ CHECK0 }
CLOSE { }
| pers_name_nsfx_sect { OCCUR2(NSFX, 0, 1) }
| source_cit_sub
| note_struc_sub
+ | no_std_sub
;
-pers_name_npfx_sect : OPEN DELIM TAG_NPFX DELIM line_item CLOSE { }
+pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item
+ { START(NPFX, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_givn_sect : OPEN DELIM TAG_GIVN DELIM line_item CLOSE { }
+pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
+ { START(GIVN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_nick_sect : OPEN DELIM TAG_NICK DELIM line_item CLOSE { }
+pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
+ { START(NICK, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_spfx_sect : OPEN DELIM TAG_SPFX DELIM line_item CLOSE { }
+pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
+ { START(SPFX, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_surn_sect : OPEN DELIM TAG_SURN DELIM line_item CLOSE { }
+pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
+ { START(SURN, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_nsfx_sect : OPEN DELIM TAG_NSFX DELIM line_item CLOSE { }
+pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item
+ { START(NSFX, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* PLACE STRUCTURE */
place_struc_sub : place_struc_plac_sect /* 0:M */
;
-place_struc_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item
- { OPEN(PLAC) }
+place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC, NULL) }
place_struc_plac_subs
{ CHECK0 }
CLOSE { }
place_struc_plac_sub : place_plac_form_sect { OCCUR2(FORM, 0, 1) }
| source_cit_sub
| note_struc_sub
+ | no_std_sub
;
-place_plac_form_sect : OPEN DELIM TAG_FORM DELIM line_item CLOSE { }
+place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SOURCE_CITATION */
;
source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
- { OPEN(SOUR) }
+ { START(SOUR, NULL) }
source_cit_link_subs
{ CHECK0 }
CLOSE { }
| source_cit_quay_sect { OCCUR2(QUAY, 0, 1) }
| multim_link_sub
| note_struc_sub
+ | no_std_sub
;
-source_cit_page_sect : OPEN DELIM TAG_PAGE DELIM line_item CLOSE { }
+source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
+ { START(PAGE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-source_cit_even_sect : OPEN DELIM TAG_EVEN DELIM line_item
- { OPEN(EVEN) }
+source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item
+ { START(EVEN, NULL) }
source_cit_even_subs
{ CHECK0 }
CLOSE { }
;
source_cit_even_sub : source_cit_even_role_sect { OCCUR2(ROLE, 0, 1) }
+ | no_std_sub
;
-source_cit_even_role_sect : OPEN DELIM TAG_ROLE DELIM line_item CLOSE { }
+source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
+ { START(ROLE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
source_cit_data_sect : OPEN DELIM TAG_DATA
- { OPEN(DATA) }
+ { START(DATA, NULL) }
source_cit_data_subs
{ CHECK0 }
CLOSE { }
source_cit_data_sub : source_cit_data_date_sect { OCCUR2(DATE, 0, 1) }
| source_cit_text_sect /* 0:M */
+ | no_std_sub
;
-source_cit_data_date_sect : OPEN DELIM TAG_DATE DELIM line_item CLOSE { }
+source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-source_cit_text_sect : OPEN DELIM TAG_TEXT DELIM line_item
- { OPEN(TEXT) }
+source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item
+ { START(TEXT, NULL) }
source_cit_text_subs
{ CHECK0 }
CLOSE { }
;
source_cit_text_sub : continuation_sub
+ | no_std_sub
;
-source_cit_quay_sect : OPEN DELIM TAG_QUAY DELIM line_item CLOSE { }
+source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
+ { START(QUAY, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
-source_cit_emb_sect : OPEN DELIM TAG_SOUR DELIM line_item
- { OPEN(SOUR) }
+source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item
+ { START(SOUR, NULL) }
source_cit_emb_subs
{ CHECK0 }
CLOSE { }
source_cit_emb_sub : continuation_sub
| source_cit_text_sect /* 0:M */
| note_struc_sub
+ | no_std_sub
;
/* SOURCE REPOSITORY CITATION */
source_repos_cit_sub : source_repos_repo_sect { OCCUR2(REPO, 0, 1) }
;
-source_repos_repo_sect : OPEN DELIM TAG_REPO DELIM POINTER
- { OPEN(REPO) }
+source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
+ { START(REPO, NULL) }
source_repos_repo_subs
{ CHECK0 }
CLOSE { }
source_repos_repo_sub : note_struc_sub
| caln_sect /* 0:M */
+ | no_std_sub
;
-caln_sect : OPEN DELIM TAG_CALN DELIM line_item
- { OPEN(CALN) }
+caln_sect : OPEN DELIM TAG_CALN mand_line_item
+ { START(CALN, NULL) }
caln_subs
{ CHECK0 }
CLOSE { }
;
caln_sub : caln_medi_sect { OCCUR2(MEDI, 0, 1) }
+ | no_std_sub
;
-caln_medi_sect : OPEN DELIM TAG_MEDI DELIM line_item CLOSE { }
+caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item
+ { START(MEDI, NULL) } no_std_subs { CHECK0 } CLOSE { }
;
/* SPOUSE TO FAMILY LINK */
spou_fam_link_sub : spou_fam_fams_sect /* 0:M */
;
-spou_fam_fams_sect : OPEN DELIM TAG_FAMS DELIM POINTER
- { OPEN(FAMS) }
+spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer
+ { START(FAMS, NULL) }
spou_fam_fams_subs
{ CHECK0 }
CLOSE { }
;
spou_fam_fams_sub : note_struc_sub
+ | no_std_sub
;
/*********************************************************************/
/**** General ****/
/*********************************************************************/
+no_std_subs : /* empty */
+ | no_std_subs no_std_sub
+ ;
+
+no_std_sub : user_sect /* 0:M */
+ | gen_sect
+ | error error_subs CLOSE { HANDLE_ERROR }
+ ;
+
+no_std_rec : user_rec /* 0:M */
+ | gen_rec
+ | error error_subs CLOSE { HANDLE_ERROR }
+ ;
+
+user_rec : OPEN DELIM opt_xref USERTAG
+ { if ($4[0] != '_') {
+ gedcom_error("Undefined tag (and not a valid user tag): %s",
+ $4);
+ YYERROR;
+ }
+ }
+ opt_value
+ { $<ctxt>$ = start_record(REC_USER, $1, $3, $4);
+ START($4, $<ctxt>$)
+ }
+ user_sects
+ { CHECK0 }
+ CLOSE
+ { end_record(REC_USER, $<ctxt>7); }
+ ;
user_sect : OPEN DELIM opt_xref USERTAG
{ if ($4[0] != '_') {
gedcom_error("Undefined tag (and not a valid user tag): %s",
YYERROR;
}
}
- opt_value user_sects CLOSE { }
+ opt_value
+ { $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6, $6);
+ START($4, $<ctxt>$);
+ }
+ user_sects
+ { CHECK0 }
+ CLOSE
+ { end_element(ELT_USER, PARENT, $<ctxt>7, NULL);
+ }
;
user_sects : /* empty */ { }
| user_sects user_sect { }
;
-opt_xref : /* empty */ { }
- | POINTER DELIM { }
+opt_xref : /* empty */ { $$ = NULL; }
+ | POINTER DELIM { $$ = $1; }
;
-opt_value : /* empty */ { }
- | DELIM line_value { }
+opt_value : /* empty */ { $$ = NULL; }
+ | DELIM line_value { $$ = $2; }
;
-line_value : POINTER { }
- | line_item { }
+line_value : POINTER { $$ = $1; }
+ | line_item { $$ = $1; }
;
+mand_pointer : /* empty */ { gedcom_error("Missing pointer"); YYERROR; }
+ | DELIM POINTER { gedcom_debug_print("==Ptr: %s==\n", $2);
+ $$ = $2; }
+ ;
+
+mand_line_item : /* empty */ { gedcom_error("Missing value"); YYERROR; }
+ | DELIM line_item { gedcom_debug_print("==Val: %s==\n", $2);
+ $$ = $2; }
+ ;
+
opt_line_item : /* empty */ { }
| DELIM line_item { }
;
-line_item : anychar { }
- | ESCAPE { }
- | line_item anychar { }
- | line_item ESCAPE { }
+line_item : anychar { size_t i;
+ CLEAR_BUFFER(line_item_buf);
+ line_item_buf_ptr = line_item_buf;
+ /* The following also takes care of '@@' */
+ if (!strncmp($1, "@@", 3))
+ *line_item_buf_ptr++ = '@';
+ else
+ for (i=0; i < strlen($1); i++)
+ *line_item_buf_ptr++ = $1[i];
+ $$ = line_item_buf;
+ }
+ | ESCAPE { CLEAR_BUFFER(line_item_buf);
+ line_item_buf_ptr = line_item_buf;
+ /* For now, ignore escapes */
+ $$ = line_item_buf;
+ }
+ | line_item anychar
+ { size_t i;
+ /* The following also takes care of '@@' */
+ if (!strncmp($2, "@@", 3))
+ *line_item_buf_ptr++ = '@';
+ else
+ for (i=0; i < strlen($2); i++)
+ *line_item_buf_ptr++ = $2[i];
+ $$ = line_item_buf;
+ }
+ | line_item ESCAPE
+ { /* For now, ignore escapes */
+ $$ = line_item_buf;
+ }
;
anychar : ANYCHAR { }
| DELIM { }
;
-/*
-gen_sect : OPEN DELIM opt_xref anytag
+error_subs : /* empty */
+ | error_subs error_sect
+ ;
+
+error_sect : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
+
+gen_sect : OPEN DELIM opt_xref anystdtag
{ INVALID_TAG($4); }
opt_value opt_sects CLOSE
{ }
;
-gen_rec : OPEN DELIM opt_xref anytag
- { INVALID_TOP_TAG($4) }
+gen_rec : gen_rec_top
+ | gen_rec_norm
+ ;
+
+gen_rec_norm : OPEN DELIM opt_xref anystdtag
+ { INVALID_TOP_TAG($4) }
+ opt_value opt_sects CLOSE
+ { }
+ ;
+
+gen_rec_top : OPEN DELIM anytoptag
+ { gedcom_error("Missing cross-reference"); YYERROR; }
opt_value opt_sects CLOSE
- { }
+ { }
;
-opt_sects : <empty> { }
+opt_sects : /* empty */ { }
| opt_sects gen_sect { }
;
-anytag : TAG_ABBR
+anytag : USERTAG { }
+ | anystdtag { }
+ ;
+
+anytoptag : TAG_FAM
+ | TAG_INDI
+ | TAG_OBJE
+ | TAG_NOTE
+ | TAG_REPO
+ | TAG_SOUR
+ | TAG_SUBN
+ | TAG_SUBM
+ ;
+
+anystdtag : TAG_ABBR
| TAG_ADDR
| TAG_ADR1
| TAG_ADR2 { }
| TAG_VERS { }
| TAG_WIFE { }
| TAG_WILL { }
-*/
+
%%
/* Functions that handle the counting of subtags */
-int* count_arrays[MAXGEDCOMLEVEL+1];
-char tag_stack[MAXGEDCOMLEVEL+1][MAXSTDTAGLENGTH+1];
+int* count_arrays[MAXGEDCLEVEL+1];
+char tag_stack[MAXGEDCLEVEL+1][MAXSTDTAGLEN+1];
+Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1];
void push_countarray()
{
int *count = NULL;
- if (count_level > MAXGEDCOMLEVEL) {
+ if (count_level > MAXGEDCLEVEL) {
gedcom_error("Internal error: count array overflow");
exit(1);
}
else {
count = (int *)calloc(YYNTOKENS, sizeof(int));
- if (count == NULL) { int *count = count_arrays[count_level];
-
+ if (count == NULL) {
gedcom_error("Internal error: count array calloc error");
exit(1);
}
void set_parenttag(char* tag)
{
- strncpy(tag_stack[count_level], tag, MAXSTDTAGLENGTH+1);
+ strncpy(tag_stack[count_level], tag, MAXSTDTAGLEN+1);
+}
+
+void set_parentctxt(Gedcom_ctxt ctxt)
+{
+ ctxt_stack[count_level] = ctxt;
}
char* get_parenttag()
return tag_stack[count_level];
}
+Gedcom_ctxt get_parentctxt()
+{
+ return ctxt_stack[count_level];
+}
+
int count_tag(int tag)
{
int *count = count_arrays[count_level];
}
/* Enabling debug mode */
+/* level 0: no debugging */
+/* level 1: only internal */
+/* level 2: also bison */
+FILE* trace_output;
-void gedcom_enable_debug()
+void gedcom_set_debug_level(int level, FILE* f)
{
+ if (f != NULL)
+ trace_output = f;
+ else
+ trace_output = stderr;
+ if (level > 0) {
+ gedcom_high_level_debug = 1;
+ }
+ if (level > 1) {
#if YYDEBUG != 0
- gedcom_debug = 1;
+ gedcom_debug = 1;
#endif
+ }
+}
+
+int gedcom_debug_print(char* s, ...)
+{
+ int res;
+ if (gedcom_high_level_debug) {
+ va_list ap;
+ va_start(ap, s);
+ res = vfprintf(trace_output, s, ap);
+ va_end(ap);
+ }
+ return(res);
}
/* Setting the error mechanism */
+void gedcom_set_error_handling(Gedcom_err_mech mechanism)
+{
+ error_mechanism = mechanism;
+}
+
+/* Compatibility handling */
+
+void gedcom_set_compat_handling(int enable_compat)
+{
+ compat_enabled = enable_compat;
+}
+
+void set_compatibility(char* program)
+{
+ if (compat_enabled) {
+ gedcom_debug_print("==== Program: %s\n", program);
+ if (! strncmp(program, "ftree", 6)) {
+ gedcom_warning("Enabling compatibility with 'ftree'");
+ compatibility = C_FTREE;
+ }
+ else {
+ compatibility = 0;
+ }
+ }
+}
-void gedcom_set_error_handling(MECHANISM mechanism)
+int compat_mode(int compat_flags)
{
- curr_mechanism = mechanism;
+ return (compat_flags & compatibility);
}
projects / gedcom-parse.git / blobdiff