X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom_lex_common.c;h=8e83d04555b2f5cff0e734224238032182551ec5;hb=3068ed1f64a96d42cdde19cfebf1468ec9169e62;hp=e1c17bb78b12dfb89b510a086d4cdc5d1282d7f4;hpb=dc88e8545a834df924004ad1a4742ee06e3e7416;p=gedcom-parse.git diff --git a/gedcom/gedcom_lex_common.c b/gedcom/gedcom_lex_common.c index e1c17bb..8e83d04 100644 --- a/gedcom/gedcom_lex_common.c +++ b/gedcom/gedcom_lex_common.c @@ -1,5 +1,5 @@ /* Common lexer code. - Copyright (C) 2001 The Genes Development Team + Copyright (C) 2001, 2002 The Genes Development Team This file is part of the Gedcom parser library. Contributed by Peter Verthez , 2001. @@ -73,8 +73,8 @@ int test_loop(ENCODING enc, char* code) case DELIM: printf("DELIM "); break; case ANYCHAR: printf("%s ", gedcom_lval.string); break; case POINTER: printf("POINTER(%s) ", gedcom_lval.string); break; - case USERTAG: printf("USERTAG(%s) ", gedcom_lval.string); break; - default: printf("TAG(%s) ", gedcom_lval.string); break; + case USERTAG: printf("USERTAG(%s) ", gedcom_lval.tag.string); break; + default: printf("TAG(%s) ", gedcom_lval.tag.string); break; } tok = gedcom_lex(); } @@ -107,7 +107,8 @@ int test_loop(ENCODING enc, char* code) #define MKTAGACTION(THETAG) \ { CHECK_LINE_LEN; \ - gedcom_lval.string = TO_INTERNAL(yytext, tag_buf); \ + gedcom_lval.tag.string = TO_INTERNAL(yytext, tag_buf); \ + gedcom_lval.tag.value = TAG_##THETAG; \ BEGIN(NORMAL); \ return TAG_##THETAG; \ } @@ -211,7 +212,8 @@ int test_loop(ENCODING enc, char* code) return BADTOKEN; \ } \ CHECK_LINE_LEN; \ - gedcom_lval.string = TO_INTERNAL(yytext, tag_buf); \ + gedcom_lval.tag.string = TO_INTERNAL(yytext, tag_buf); \ + gedcom_lval.tag.value = USERTAG; \ BEGIN(NORMAL); \ return USERTAG; \ }