+/* 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"
+
+int count_level = 0;
+int fail = 0;
+int compat_enabled = 1;
+int gedcom_high_level_debug = 0;
+int compatibility = 0;
+MECHANISM error_mechanism = IMMED_FAIL;
+
+char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
+char *line_item_buf_ptr;
-int count_level=0;
-int fail=0;
-MECHANISM curr_mechanism=IMMED_FAIL;
+enum _COMPAT {
+ C_FTREE = 0x01
+};
/* These are defined at the bottom of the file */
void push_countarray();
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 HANDLE_ERROR \
- { \
- if (curr_mechanism == IMMED_FAIL) { \
- YYABORT; \
- } \
- else if (curr_mechanism == DEFER_FAIL) { \
- yyerrok; fail = 1; \
- } \
- else if (curr_mechanism == IGNORE_ERRORS) { \
- yyerrok; \
- } \
+#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 OPEN(PARENTTAG) \
- { ++count_level; \
- set_parenttag(#PARENTTAG); \
- push_countarray(); \
+#define START(PARENTTAG) \
+ { ++count_level; \
+ set_parenttag(#PARENTTAG); \
+ 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); \
- HANDLE_ERROR; \
- } \
+#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;
}
%token_table
-%expect 291
+%expect 300
%token <string> BADTOKEN
-%token <string> OPEN
+%token <number> OPEN
%token <string> CLOSE
%token <string> ESCAPE
%token <string> DELIM
%token <string> TAG_WILL
%type <string> anystdtag
+%type <string> anytoptag
+%type <string> line_item
+%type <string> mand_line_item
+%type <string> note_line_item
+%type <string> anychar
%%
/**** Header ****/
/*********************************************************************/
head_sect : OPEN DELIM TAG_HEAD
- { OPEN(HEAD) }
+ { START(HEAD) }
head_subs
- { CHECK4(SOUR, SUBM, GEDC, CHAR) }
+ { if (compat_mode(C_FTREE))
+ CHECK3(SOUR, GEDC, CHAR)
+ else
+ CHECK4(SOUR, SUBM, GEDC, CHAR)
+ }
CLOSE { }
;
;
/* 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);
+ gedcom_debug_print("===Source: '%s', '%s'\n",
+ $4, $3);
+ START(SOUR)
+ }
head_sour_subs
{ CHECK0 }
CLOSE
- { }
;
head_sour_subs : /* empty */
| no_std_sub
;
-head_sour_vers_sect : OPEN DELIM TAG_VERS DELIM line_item
- { OPEN(VERS)} no_std_subs { CHECK0 } CLOSE
- { }
+head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { START(VERS)} no_std_subs { CHECK0 } CLOSE
+ { gedcom_debug_print("===Source version: '%s'\n", $4);
+ }
;
-head_sour_name_sect : OPEN DELIM TAG_NAME DELIM line_item
- { OPEN(NAME) } no_std_subs { CHECK0 } CLOSE
- { }
+head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME) } no_std_subs { CHECK0 } CLOSE
+ { gedcom_debug_print("===Source name: '%s'\n", $4);
+ }
;
-head_sour_corp_sect : OPEN DELIM TAG_CORP DELIM line_item
- { OPEN(CORP) }
+head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item
+ { gedcom_debug_print("===Source corp name: '%s'\n", $4);
+ START(CORP) }
head_sour_corp_subs
{ CHECK0 }
CLOSE
| 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
+ { START(DATA) }
head_sour_data_subs
{ CHECK0 }
CLOSE
| no_std_sub
;
-head_sour_data_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE
+head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } no_std_subs { CHECK0 } CLOSE
{ }
;
-head_sour_data_copr_sect : OPEN DELIM TAG_COPR DELIM line_item
- { OPEN(COPR) } no_std_subs { CHECK0 } CLOSE
+head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
+ { START(COPR) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.DEST */
-head_dest_sect : OPEN DELIM TAG_DEST DELIM line_item
- { OPEN(DEST) } no_std_subs { CHECK0 } CLOSE
+head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
+ { START(DEST) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.DATE */
-head_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) }
+head_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) }
head_date_subs
{ CHECK0 }
CLOSE
| no_std_sub
;
-head_date_time_sect : OPEN DELIM TAG_TIME DELIM line_item
- { OPEN(TIME) } no_std_subs { CHECK0 } CLOSE
+head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
+ { START(TIME) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.SUBM */
-head_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER
- { OPEN(SUBM) } no_std_subs { CHECK0 } CLOSE
+head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.SUBN */
-head_subn_sect : OPEN DELIM TAG_SUBN DELIM POINTER
- { OPEN(SUBN) } no_std_subs { CHECK0 } CLOSE
+head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
+ { START(SUBN) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.FILE */
-head_file_sect : OPEN DELIM TAG_FILE DELIM line_item
- { OPEN(FILE) } no_std_subs { CHECK0 } CLOSE
+head_file_sect : OPEN DELIM TAG_FILE mand_line_item
+ { START(FILE) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.COPR */
-head_copr_sect : OPEN DELIM TAG_COPR DELIM line_item
- { OPEN(COPR) } no_std_subs { CHECK0 } CLOSE
+head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
+ { START(COPR) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.GEDC */
head_gedc_sect : OPEN DELIM TAG_GEDC
- { OPEN(GEDC) }
+ { START(GEDC) }
head_gedc_subs
{ CHECK2(VERS, FORM) }
CLOSE
| head_gedc_form_sect { OCCUR2(FORM, 1, 1) }
| no_std_sub
;
-head_gedc_vers_sect : OPEN DELIM TAG_VERS DELIM line_item
- { OPEN(VERS) } no_std_subs { CHECK0 } CLOSE
+head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { START(VERS) } no_std_subs { CHECK0 } CLOSE
{ }
;
-head_gedc_form_sect : OPEN DELIM TAG_FORM DELIM line_item
- { OPEN(FORM) } no_std_subs { CHECK0 } CLOSE
+head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* 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;
+ START(CHAR) }
head_char_subs
{ CHECK0 }
CLOSE
head_char_sub : head_char_vers_sect { OCCUR2(VERS, 0, 1) }
| no_std_sub
;
-head_char_vers_sect : OPEN DELIM TAG_VERS DELIM line_item
- { OPEN(VERS) } no_std_subs { CHECK0 } CLOSE
+head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
+ { START(VERS) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.LANG */
-head_lang_sect : OPEN DELIM TAG_LANG DELIM line_item
- { OPEN(LANG) } no_std_subs { CHECK0 } CLOSE
+head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
+ { START(LANG) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.PLAC */
head_plac_sect : OPEN DELIM TAG_PLAC
- { OPEN(PLAC) }
+ { START(PLAC) }
head_plac_subs
{ CHECK1(FORM) }
CLOSE
head_plac_sub : head_plac_form_sect { OCCUR2(FORM, 1, 1) }
| no_std_sub
;
-head_plac_form_sect : OPEN DELIM TAG_FORM DELIM line_item
- { OPEN(FORM) } no_std_subs { CHECK0 } CLOSE
+head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* HEAD.NOTE */
-head_note_sect : OPEN DELIM TAG_NOTE DELIM line_item
- { OPEN(NOTE) }
+head_note_sect : OPEN DELIM TAG_NOTE mand_line_item
+ { START(NOTE) }
head_note_subs
{ CHECK0 }
CLOSE
/**** Family record ****/
/*********************************************************************/
fam_rec : OPEN DELIM POINTER DELIM TAG_FAM
- { OPEN(FAM) }
+ { START(FAM) }
fam_subs
{ CHECK0 }
CLOSE { }
;
/* FAM.HUSB */
-fam_husb_sect : OPEN DELIM TAG_HUSB DELIM POINTER
- { OPEN(HUSB) } no_std_subs { CHECK0 } CLOSE
+fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
+ { START(HUSB) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.WIFE */
-fam_wife_sect : OPEN DELIM TAG_WIFE DELIM POINTER
- { OPEN(WIFE) } no_std_subs { CHECK0 } CLOSE
+fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
+ { START(WIFE) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.CHIL */
-fam_chil_sect : OPEN DELIM TAG_CHIL DELIM POINTER
- { OPEN(CHIL) } no_std_subs { CHECK0 } CLOSE
+fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
+ { START(CHIL) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.NCHI */
-fam_nchi_sect : OPEN DELIM TAG_NCHI DELIM line_item
- { OPEN(NCHI) } no_std_subs { CHECK0 } CLOSE
+fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
+ { START(NCHI) } no_std_subs { CHECK0 } CLOSE
{ }
;
/* FAM.SUBM */
-fam_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER
- { OPEN(SUBM) } no_std_subs { CHECK0 } CLOSE
+fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM) } no_std_subs { CHECK0 } CLOSE
{ }
;
/**** Individual record ****/
/*********************************************************************/
indiv_rec : OPEN DELIM POINTER DELIM TAG_INDI
- { OPEN(INDI) }
+ { START(INDI) }
indi_subs
{ CHECK0 }
CLOSE { }
| indi_afn_sect /* 0:M */
| ident_struc_sub /* 0:1 */
| change_date_sub /* 0:1 */
- | no_std_sub
+ | 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
- { OPEN(RESN) } no_std_subs { CHECK0 } CLOSE { }
+indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
+ { START(RESN) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.SEX */
-indi_sex_sect : OPEN DELIM TAG_SEX DELIM line_item
- { OPEN(SEX) } no_std_subs { CHECK0 } CLOSE { }
+indi_sex_sect : OPEN DELIM TAG_SEX mand_line_item
+ { START(SEX) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.SUBM */
-indi_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER
- { OPEN(SUBM) } no_std_subs { CHECK0 } CLOSE { }
+indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.ALIA */
-indi_alia_sect : OPEN DELIM TAG_ALIA DELIM POINTER
- { OPEN(ALIA) } no_std_subs { CHECK0 } CLOSE { }
+indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
+ { START(ALIA) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.ANCI */
-indi_anci_sect : OPEN DELIM TAG_ANCI DELIM POINTER
- { OPEN(ANCI) } no_std_subs { CHECK0 } CLOSE { }
+indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
+ { START(ANCI) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.DESI */
-indi_desi_sect : OPEN DELIM TAG_DESI DELIM POINTER
- { OPEN(DESI) } no_std_subs { CHECK0 } CLOSE { }
+indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
+ { START(DESI) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.RFN */
-indi_rfn_sect : OPEN DELIM TAG_RFN DELIM line_item
- { OPEN(RFN) } no_std_subs { CHECK0 } CLOSE { }
+indi_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
+ { START(RFN) } no_std_subs { CHECK0 } CLOSE { }
;
/* INDI.AFN */
-indi_afn_sect : OPEN DELIM TAG_AFN DELIM line_item
- { OPEN(AFN) } no_std_subs { CHECK0 } CLOSE { }
+indi_afn_sect : OPEN DELIM TAG_AFN mand_line_item
+ { START(AFN) } no_std_subs { CHECK0 } CLOSE { }
;
+/* INDI.ADDR (Only for 'ftree' compatibility) */
+ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
+ { START(ADDR) } no_std_subs { CHECK0 } CLOSE { }
+
/*********************************************************************/
/**** Multimedia record ****/
/*********************************************************************/
multim_rec : OPEN DELIM POINTER DELIM TAG_OBJE
- { OPEN(OBJE) }
+ { START(OBJE) }
obje_subs
{ CHECK2(FORM, BLOB) }
CLOSE { }
;
/* OBJE.FORM */
-obje_form_sect : OPEN DELIM TAG_FORM DELIM line_item
- { OPEN(FORM) } no_std_subs { CHECK0 } CLOSE { }
+obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.TITL */
-obje_titl_sect : OPEN DELIM TAG_TITL DELIM line_item
- { OPEN(TITL) } no_std_subs { CHECK0 } CLOSE { }
+obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.BLOB */
obje_blob_sect : OPEN DELIM TAG_BLOB
- { OPEN(BLOB) }
+ { START(BLOB) }
obje_blob_subs
{ CHECK1(CONT) }
CLOSE { }
| no_std_sub
;
-obje_blob_cont_sect : OPEN DELIM TAG_CONT DELIM line_item
- { OPEN(CONT) } no_std_subs { CHECK0 } CLOSE { }
+obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT) } no_std_subs { CHECK0 } CLOSE { }
;
/* OBJE.OBJE */
-obje_obje_sect : OPEN DELIM TAG_OBJE DELIM POINTER
- { OPEN(OBJE) } no_std_subs { CHECK0 } CLOSE { }
+obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
+ { START(OBJE) } 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
+ { START(NOTE) }
note_subs
{ CHECK0 }
CLOSE { }
;
+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
;
/**** Repository record ****/
/*********************************************************************/
repos_rec : OPEN DELIM POINTER DELIM TAG_REPO
- { OPEN(REPO) }
+ { START(REPO) }
repo_subs
{ CHECK0 }
CLOSE { }
;
/* REPO.NAME */
-repo_name_sect : OPEN DELIM TAG_NAME DELIM line_item
- { OPEN(NAME) } no_std_subs { CHECK0 } CLOSE {}
+repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME) } no_std_subs { CHECK0 } CLOSE {}
;
/*********************************************************************/
/**** Source record ****/
/*********************************************************************/
source_rec : OPEN DELIM POINTER DELIM TAG_SOUR
- { OPEN(SOUR) }
+ { START(SOUR) }
sour_subs
{ CHECK0 }
CLOSE { }
/* SOUR.DATA */
sour_data_sect : OPEN DELIM TAG_DATA
- { OPEN(DATA) }
+ { START(DATA) }
sour_data_subs
{ CHECK0 }
CLOSE { }
| 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) }
sour_data_even_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-sour_data_even_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE { }
+sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } no_std_subs { CHECK0 } CLOSE { }
;
-sour_data_even_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item
- { OPEN(PLAC) } no_std_subs { CHECK0 } CLOSE { }
+sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC) } no_std_subs { CHECK0 } CLOSE { }
;
-sour_data_agnc_sect : OPEN DELIM TAG_AGNC DELIM line_item
- { OPEN(AGNC) } no_std_subs { CHECK0 } CLOSE { }
+sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
+ { START(AGNC) } 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) }
sour_auth_subs
{ CHECK0 }
CLOSE { }
;
/* 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) }
sour_titl_subs
{ CHECK0 }
CLOSE { }
;
/* SOUR.ABBR */
-sour_abbr_sect : OPEN DELIM TAG_ABBR DELIM line_item
- { OPEN(ABBR) } no_std_subs { CHECK0 } CLOSE { }
+sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
+ { START(ABBR) } 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) }
sour_publ_subs
{ CHECK0 }
CLOSE { }
;
/* 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) }
sour_text_subs
{ CHECK0 }
CLOSE { }
/**** Submission record ****/
/*********************************************************************/
submis_rec : OPEN DELIM POINTER DELIM TAG_SUBN
- { OPEN(SUBN) }
+ { START(SUBN) }
subn_subs
{ CHECK0 }
CLOSE { }
;
/* SUBN.SUBM */
-subn_subm_sect : OPEN DELIM TAG_SUBM DELIM POINTER
- { OPEN(SUBM) } no_std_subs { CHECK0 } CLOSE { }
+subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
+ { START(SUBM) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.FAMF */
-subn_famf_sect : OPEN DELIM TAG_FAMF DELIM line_item
- { OPEN(FAMF) } no_std_subs { CHECK0 } CLOSE { }
+subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
+ { START(FAMF) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.TEMP */
-subn_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item
- { OPEN(TEMP) } no_std_subs { CHECK0 } CLOSE { }
+subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.ANCE */
-subn_ance_sect : OPEN DELIM TAG_ANCE DELIM line_item
- { OPEN(ANCE) } no_std_subs { CHECK0 } CLOSE { }
+subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
+ { START(ANCE) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.DESC */
-subn_desc_sect : OPEN DELIM TAG_DESC DELIM line_item
- { OPEN(DESC) } no_std_subs { CHECK0 } CLOSE { }
+subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
+ { START(DESC) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.ORDI */
-subn_ordi_sect : OPEN DELIM TAG_ORDI DELIM line_item
- { OPEN(ORDI) } no_std_subs { CHECK0 } CLOSE { }
+subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
+ { START(ORDI) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBN.RIN */
-subn_rin_sect : OPEN DELIM TAG_RIN DELIM line_item
- { OPEN(RIN) } no_std_subs { CHECK0 } CLOSE { }
+subn_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN) } no_std_subs { CHECK0 } CLOSE { }
;
/*********************************************************************/
/**** Submitter record ****/
/*********************************************************************/
submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM
- { OPEN(SUBM) }
+ { START(SUBM) }
subm_subs
{ CHECK1(NAME) }
CLOSE { }
;
/* SUBM.NAME */
-subm_name_sect : OPEN DELIM TAG_NAME DELIM line_item
- { OPEN(NAME) } no_std_subs { CHECK0 } CLOSE { }
+subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
+ { START(NAME) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.LANG */
-subm_lang_sect : OPEN DELIM TAG_LANG DELIM line_item
- { OPEN(LANG) } no_std_subs { CHECK0 } CLOSE { }
+subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
+ { START(LANG) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.RFN */
-subm_rfn_sect : OPEN DELIM TAG_RFN DELIM line_item
- { OPEN(RFN) } no_std_subs { CHECK0 } CLOSE { }
+subm_rfn_sect : OPEN DELIM TAG_RFN mand_line_item
+ { START(RFN) } no_std_subs { CHECK0 } CLOSE { }
;
/* SUBM.RIN */
-subm_rin_sect : OPEN DELIM TAG_RIN DELIM line_item
- { OPEN(RIN) } no_std_subs { CHECK0 } CLOSE { }
+subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN) } 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) }
addr_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-addr_cont_sect : OPEN DELIM TAG_CONT DELIM line_item
- { OPEN(CONT) } no_std_subs { CHECK0 } CLOSE { }
+addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_adr1_sect : OPEN DELIM TAG_ADR1 DELIM line_item
- { OPEN(ADR1) } no_std_subs { CHECK0 } CLOSE { }
+addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
+ { START(ADR1) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_adr2_sect : OPEN DELIM TAG_ADR2 DELIM line_item
- { OPEN(ADR2) } no_std_subs { CHECK0 } CLOSE { }
+addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
+ { START(ADR2) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_city_sect : OPEN DELIM TAG_CITY DELIM line_item
- { OPEN(CITY) } no_std_subs { CHECK0 } CLOSE { }
+addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
+ { START(CITY) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_stae_sect : OPEN DELIM TAG_STAE DELIM line_item
- { OPEN(STAE) } no_std_subs { CHECK0 } CLOSE { }
+addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
+ { START(STAE) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_post_sect : OPEN DELIM TAG_POST DELIM line_item
- { OPEN(POST) } no_std_subs { CHECK0 } CLOSE { }
+addr_post_sect : OPEN DELIM TAG_POST mand_line_item
+ { START(POST) } no_std_subs { CHECK0 } CLOSE { }
;
-addr_ctry_sect : OPEN DELIM TAG_CTRY DELIM line_item
- { OPEN(CTRY) } no_std_subs { CHECK0 } CLOSE { }
+addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
+ { START(CTRY) } no_std_subs { CHECK0 } CLOSE { }
;
-phon_sect : OPEN DELIM TAG_PHON DELIM line_item
- { OPEN(PHON) } no_std_subs { CHECK0 } CLOSE { }
+phon_sect : OPEN DELIM TAG_PHON mand_line_item
+ { START(PHON) } 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) }
asso_subs
{ CHECK2(TYPE,RELA) }
CLOSE { }
| no_std_sub
;
-asso_type_sect : OPEN DELIM TAG_TYPE DELIM line_item
- { OPEN(TYPE) } no_std_subs { CHECK0 } CLOSE { }
+asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE) } no_std_subs { CHECK0 } CLOSE { }
;
-asso_rela_sect : OPEN DELIM TAG_RELA DELIM line_item
- { OPEN(RELA) } no_std_subs { CHECK0 } CLOSE { }
+asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item
+ { START(RELA) } no_std_subs { CHECK0 } CLOSE { }
;
/* CHANGE DATE */
;
change_date_chan_sect : OPEN DELIM TAG_CHAN
- { OPEN(CHAN) }
+ { START(CHAN) }
change_date_chan_subs
{ CHECK1(DATE) }
CLOSE { }
| 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) }
change_date_date_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-change_date_date_time_sect : OPEN DELIM TAG_TIME DELIM line_item
- { OPEN(TIME) } no_std_subs { CHECK0 } CLOSE { }
+change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
+ { START(TIME) } 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) }
famc_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-famc_pedi_sect : OPEN DELIM TAG_PEDI DELIM line_item
- { OPEN(PEDI) } no_std_subs { CHECK0 } CLOSE { }
+famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item
+ { START(PEDI) } no_std_subs { CHECK0 } CLOSE { }
;
/* CONTINUATION SUBSECTIONS */
| conc_sect /* 0:M */
;
-cont_sect : OPEN DELIM TAG_CONT DELIM line_item
- { OPEN(CONT) } no_std_subs { CHECK0 } CLOSE { }
+cont_sect : OPEN DELIM TAG_CONT mand_line_item
+ { START(CONT) } no_std_subs { CHECK0 } CLOSE { }
;
-conc_sect : OPEN DELIM TAG_CONC DELIM line_item
- { OPEN(CONC) } no_std_subs { CHECK0 } CLOSE { }
+conc_sect : OPEN DELIM TAG_CONC mand_line_item
+ { START(CONC) } no_std_subs { CHECK0 } CLOSE { }
;
/* EVENT DETAIL */
| note_struc_sub
;
-event_detail_type_sect : OPEN DELIM TAG_TYPE DELIM line_item
- { OPEN(TYPE) } no_std_subs { CHECK0 } CLOSE { }
+event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE { }
+event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_age_sect : OPEN DELIM TAG_AGE DELIM line_item
- { OPEN(AGE) } no_std_subs { CHECK0 } CLOSE { }
+event_detail_age_sect : OPEN DELIM TAG_AGE mand_line_item
+ { START(AGE) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_agnc_sect : OPEN DELIM TAG_AGNC DELIM line_item
- { OPEN(AGNC) } no_std_subs { CHECK0 } CLOSE { }
+event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
+ { START(AGNC) } no_std_subs { CHECK0 } CLOSE { }
;
-event_detail_caus_sect : OPEN DELIM TAG_CAUS DELIM line_item
- { OPEN(CAUS) } no_std_subs { CHECK0 } CLOSE { }
+event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
+ { START(CAUS) } 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) }
+ | TAG_CENS { START(CENS) }
+ | TAG_DIV { START(DIV) }
+ | TAG_DIVF { START(DIVF) }
+ | TAG_ENGA { START(ENGA) }
+ | TAG_MARR { START(MARR) }
+ | TAG_MARB { START(MARB) }
+ | TAG_MARC { START(MARC) }
+ | TAG_MARL { START(MARL) }
+ | TAG_MARS { START(MARS) }
;
fam_event_subs : /* empty */
;
fam_even_husb_sect : OPEN DELIM TAG_HUSB
- { OPEN(HUSB) }
+ { START(HUSB) }
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE { }
| no_std_sub
;
-fam_even_husb_age_sect : OPEN DELIM TAG_AGE DELIM line_item
- { OPEN(AGE) } no_std_subs { CHECK0 } CLOSE { }
+fam_even_husb_age_sect : OPEN DELIM TAG_AGE mand_line_item
+ { START(AGE) } no_std_subs { CHECK0 } CLOSE { }
;
fam_even_wife_sect : OPEN DELIM TAG_WIFE
- { OPEN(HUSB) }
+ { START(HUSB) }
fam_even_husb_subs
{ CHECK1(AGE) }
CLOSE { }
;
fam_gen_even_sect : OPEN DELIM TAG_EVEN
- { OPEN(EVEN) }
+ { START(EVEN) }
fam_gen_even_subs
{ CHECK0 }
CLOSE { }
| 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) }
ident_refn_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-ident_refn_type_sect : OPEN DELIM TAG_TYPE DELIM line_item
- { OPEN(TYPE) } no_std_subs { CHECK0 } CLOSE { }
+ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
+ { START(TYPE) } no_std_subs { CHECK0 } CLOSE { }
;
-ident_rin_sect : OPEN DELIM TAG_RIN DELIM line_item
- { OPEN(RIN) } no_std_subs { CHECK0 } CLOSE { }
+ident_rin_sect : OPEN DELIM TAG_RIN mand_line_item
+ { START(RIN) } 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) }
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) }
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) }
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) }
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) }
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) }
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) }
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) }
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) }
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) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
;
indiv_resi_sect : OPEN DELIM TAG_RESI
- { OPEN(RESI) }
+ { START(RESI) }
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) }
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) }
indiv_attr_event_subs
{ CHECK0 }
CLOSE { }
CLOSE { }
;
-indiv_birt_tag : TAG_BIRT { OPEN(BIRT) }
- | TAG_CHR { OPEN(CHR) }
+indiv_birt_tag : TAG_BIRT { START(BIRT) }
+ | TAG_CHR { START(CHR) }
;
indiv_birt_subs : /* empty */
| no_std_sub
;
-indiv_birt_famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER
- { OPEN(FAMC) } no_std_subs { CHECK0 } CLOSE { }
+indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC) } 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) }
+ | TAG_BURI { START(BURI) }
+ | TAG_CREM { START(CREM) }
+ | TAG_BAPM { START(BAPM) }
+ | TAG_BARM { START(BARM) }
+ | TAG_BASM { START(BASM) }
+ | TAG_BLES { START(BLES) }
+ | TAG_CHRA { START(CHRA) }
+ | TAG_CONF { START(CONF) }
+ | TAG_FCOM { START(FCOM) }
+ | TAG_ORDN { START(ORDN) }
+ | TAG_NATU { START(NATU) }
+ | TAG_EMIG { START(EMIG) }
+ | TAG_IMMI { START(IMMI) }
+ | TAG_CENS { START(CENS) }
+ | TAG_PROB { START(PROB) }
+ | TAG_WILL { START(WILL) }
+ | TAG_GRAD { START(GRAD) }
+ | TAG_RETI { START(RETI) }
;
indiv_gen_subs : /* empty */
;
indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value
- { OPEN(ADOP) }
+ { START(ADOP) }
indiv_adop_subs
{ CHECK0 }
CLOSE { }
| 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) }
indiv_adop_famc_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP DELIM line_item
- { OPEN(ADOP) } no_std_subs { CHECK0 } CLOSE { }
+indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
+ { START(ADOP) } no_std_subs { CHECK0 } CLOSE { }
;
indiv_even_sect : OPEN DELIM TAG_EVEN
- { OPEN(EVEN) }
+ { START(EVEN) }
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) }
+ | TAG_CONL { START(CONL) }
+ | TAG_ENDL { START(ENDL) }
;
lio_bapl_subs : /* empty */
| no_std_sub
;
-lio_bapl_stat_sect : OPEN DELIM TAG_STAT DELIM line_item
- { OPEN(STAT) } no_std_subs { CHECK0 } CLOSE { }
+lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item
+ { START(STAT) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE { }
+lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item
- { OPEN(TEMP) } no_std_subs { CHECK0 } CLOSE { }
+lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP) } no_std_subs { CHECK0 } CLOSE { }
;
-lio_bapl_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item
- { OPEN(PLAC) } no_std_subs { CHECK0 } CLOSE { }
+lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC) } no_std_subs { CHECK0 } CLOSE { }
;
lio_slgc_sect : OPEN DELIM TAG_SLGC
- { OPEN(SLGC) }
+ { START(SLGC) }
lio_slgc_subs
{ CHECK1(FAMC) }
CLOSE { }
| lio_slgc_famc_sect { OCCUR2(FAMC, 1, 1) }
;
-lio_slgc_famc_sect : OPEN DELIM TAG_FAMC DELIM POINTER
- { OPEN(FAMC) } no_std_subs { CHECK0 } CLOSE { }
+lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
+ { START(FAMC) } no_std_subs { CHECK0 } CLOSE { }
;
/* LDS SPOUSE SEALING */
;
lss_slgs_sect : OPEN DELIM TAG_SLGS
- { OPEN(SLGS) }
+ { START(SLGS) }
lss_slgs_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-lss_slgs_stat_sect : OPEN DELIM TAG_STAT DELIM line_item
- { OPEN(STAT) } no_std_subs { CHECK0 } CLOSE { }
+lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item
+ { START(STAT) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE { }
+lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_temp_sect : OPEN DELIM TAG_TEMP DELIM line_item
- { OPEN(TEMP) } no_std_subs { CHECK0 } CLOSE { }
+lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
+ { START(TEMP) } no_std_subs { CHECK0 } CLOSE { }
;
-lss_slgs_plac_sect : OPEN DELIM TAG_PLAC DELIM line_item
- { OPEN(PLAC) } no_std_subs { CHECK0 } CLOSE { }
+lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
+ { START(PLAC) } no_std_subs { CHECK0 } CLOSE { }
;
/* MULTIMEDIA LINK */
;
multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
- { OPEN(OBJE) } no_std_subs { CHECK0 } CLOSE { }
+ { START(OBJE) } no_std_subs { CHECK0 } CLOSE { }
;
multim_obje_emb_sect : OPEN DELIM TAG_OBJE
- { OPEN(OBJE) }
+ { START(OBJE) }
multim_obje_emb_subs
{ CHECK2(FORM,FILE) }
CLOSE { }
| no_std_sub
;
-multim_obje_form_sect : OPEN DELIM TAG_FORM DELIM line_item
- { OPEN(FORM) } no_std_subs { CHECK0 } CLOSE { }
+multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM) } no_std_subs { CHECK0 } CLOSE { }
;
-multim_obje_titl_sect : OPEN DELIM TAG_TITL DELIM line_item
- { OPEN(TITL) } no_std_subs { CHECK0 } CLOSE { }
+multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
+ { START(TITL) } no_std_subs { CHECK0 } CLOSE { }
;
-multim_obje_file_sect : OPEN DELIM TAG_FILE DELIM line_item
- { OPEN(FILE) } no_std_subs { CHECK0 } CLOSE { }
+multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
+ { START(FILE) } no_std_subs { CHECK0 } CLOSE { }
;
/* NOTE STRUCTURE */
;
note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
- { OPEN(NOTE) }
+ { START(NOTE) }
note_struc_link_subs
{ CHECK0 }
CLOSE { }
;
note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
- { OPEN(NOTE) }
+ { START(NOTE) }
note_struc_emb_subs
{ CHECK0 }
CLOSE { }
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) }
pers_name_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-pers_name_npfx_sect : OPEN DELIM TAG_NPFX DELIM line_item
- { OPEN(NPFX) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item
+ { START(NPFX) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_givn_sect : OPEN DELIM TAG_GIVN DELIM line_item
- { OPEN(GIVN) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
+ { START(GIVN) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_nick_sect : OPEN DELIM TAG_NICK DELIM line_item
- { OPEN(NICK) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
+ { START(NICK) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_spfx_sect : OPEN DELIM TAG_SPFX DELIM line_item
- { OPEN(SPFX) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
+ { START(SPFX) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_surn_sect : OPEN DELIM TAG_SURN DELIM line_item
- { OPEN(SURN) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
+ { START(SURN) } no_std_subs { CHECK0 } CLOSE { }
;
-pers_name_nsfx_sect : OPEN DELIM TAG_NSFX DELIM line_item
- { OPEN(NSFX) } no_std_subs { CHECK0 } CLOSE { }
+pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item
+ { START(NSFX) } 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) }
place_struc_plac_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-place_plac_form_sect : OPEN DELIM TAG_FORM DELIM line_item
- { OPEN(FORM) } no_std_subs { CHECK0 } CLOSE { }
+place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
+ { START(FORM) } no_std_subs { CHECK0 } CLOSE { }
;
/* SOURCE_CITATION */
;
source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
- { OPEN(SOUR) }
+ { START(SOUR) }
source_cit_link_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-source_cit_page_sect : OPEN DELIM TAG_PAGE DELIM line_item
- { OPEN(PAGE) } no_std_subs { CHECK0 } CLOSE { }
+source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
+ { START(PAGE) } 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) }
source_cit_even_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-source_cit_even_role_sect : OPEN DELIM TAG_ROLE DELIM line_item
- { OPEN(ROLE) } no_std_subs { CHECK0 } CLOSE { }
+source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
+ { START(ROLE) } no_std_subs { CHECK0 } CLOSE { }
;
source_cit_data_sect : OPEN DELIM TAG_DATA
- { OPEN(DATA) }
+ { START(DATA) }
source_cit_data_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-source_cit_data_date_sect : OPEN DELIM TAG_DATE DELIM line_item
- { OPEN(DATE) } no_std_subs { CHECK0 } CLOSE { }
+source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
+ { START(DATE) } 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) }
source_cit_text_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-source_cit_quay_sect : OPEN DELIM TAG_QUAY DELIM line_item
- { OPEN(QUAY) } no_std_subs { CHECK0 } CLOSE { }
+source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
+ { START(QUAY) } 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) }
source_cit_emb_subs
{ CHECK0 }
CLOSE { }
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) }
source_repos_repo_subs
{ CHECK0 }
CLOSE { }
| 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) }
caln_subs
{ CHECK0 }
CLOSE { }
| no_std_sub
;
-caln_medi_sect : OPEN DELIM TAG_MEDI DELIM line_item
- { OPEN(MEDI) } no_std_subs { CHECK0 } CLOSE { }
+caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item
+ { START(MEDI) } 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) }
spou_fam_fams_subs
{ CHECK0 }
CLOSE { }
| line_item { }
;
+mand_pointer : /* empty */ { gedcom_error("Missing pointer"); YYERROR; }
+ | DELIM POINTER { }
+ ;
+
+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 { }
{ }
;
-gen_rec : OPEN DELIM opt_xref anystdtag
- { 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 */ { }
| 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
/* 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];
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);
}
char* get_parenttag()
}
/* Enabling debug mode */
-
-void gedcom_enable_debug()
+/* level 0: no debugging */
+/* level 1: only internal */
+/* level 2: also bison */
+void gedcom_set_debug_level(int level)
{
+ if (level > 0) {
+ gedcom_high_level_debug = 1;
+ }
+ if (level > 1) {
#if YYDEBUG != 0
- gedcom_debug = 1;
+ gedcom_debug = 1;
#endif
+ }
}
-/* Setting the error mechanism */
+int gedcom_debug_print(char* s, ...)
+{
+ int res;
+ if (gedcom_high_level_debug) {
+ va_list ap;
+ va_start(ap, s);
+ res = vfprintf(stderr, s, ap);
+ va_end(ap);
+ }
+ return(res);
+}
+/* Setting the error mechanism */
void gedcom_set_error_handling(MECHANISM mechanism)
{
- curr_mechanism = 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;
+ }
+ }
+}
+
+int compat_mode(int compat_flags)
+{
+ return (compat_flags & compatibility);
}
projects / gedcom-parse.git / blobdiff