X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom_lex_common.c;h=753df118e615e123a26d319c7b9b813010ecae0c;hb=a6b1646d8fc8234b198d47c045a5a756a916d052;hp=0a01f150596f26e2666b6237b17c92613edfb1a8;hpb=f67a61e4c54034200a30b1dcf3dcb90919562f2f;p=gedcom-parse.git

diff --git a/gedcom/gedcom_lex_common.c b/gedcom/gedcom_lex_common.c
index 0a01f15..753df11 100644
--- a/gedcom/gedcom_lex_common.c
+++ b/gedcom/gedcom_lex_common.c
@@ -21,7 +21,7 @@
 /* $Id$ */
 /* $Name$ */
 
-#ifndef IN_LEX
+#if LEX_SECTION == 1
 
 #include "gedcom_internal.h"
 #include "multilex.h"
@@ -51,7 +51,7 @@ void message_handler(Gedcom_msg_type type, char *msg)
   fprintf(stderr, "(%d) %s\n", type, msg);
 }
 
-int test_loop(ENCODING enc, char* code)
+int test_loop(ENCODING enc, const char* code)
 {
   int tok, res;
   init_encodings();
@@ -109,18 +109,18 @@ static void error_level_too_high(int level_diff)
 		level_diff); 
 }
 
-static void error_tag_too_long(char *tag)
+static void error_tag_too_long(const char *tag)
 {
   gedcom_error(_("Tag '%s' too long, max %d characters allowed"),
 	       tag, MAXGEDCTAGLEN); 
 }
 
-static void error_invalid_character(char *str, char ch)
+static void error_invalid_character(const char *str, char ch)
 {
   gedcom_error(_("Invalid character for encoding: '%s' (0x%02x)"), str, ch); 
 }
 
-static void error_pointer_too_long(char *ptr)
+static void error_pointer_too_long(const char *ptr)
 {
   gedcom_error(_("Pointer '%s' too long, max %d characters allowed"),
 	       ptr, MAXGEDCPTRLEN);
@@ -131,15 +131,19 @@ static void error_at_character()
   gedcom_error(_("'@' character should be written as '@@' in values"));
 }
 
-static void error_unexpected_character(char* str, char ch)
+static void error_unexpected_character(const char* str, char ch)
 {
   gedcom_error(_("Unexpected character: '%s' (0x%02x)"), str, ch);
 }
 
-#else  /* of #ifndef IN_LEX */
+/* This is to bypass the iconv conversion (if the input is UTF-8 coming
+   from the program) */
+static int dummy_conv = 0;
+
+#elif LEX_SECTION == 2
 
 #define TO_INTERNAL(STR,OUTBUF) \
-  to_internal(STR, yyleng, OUTBUF, sizeof(OUTBUF))
+  (dummy_conv ? STR : to_internal(STR, yyleng, OUTBUF, sizeof(OUTBUF)))
 
 #define INIT_LINE_LEN \
   line_len = 0;
@@ -160,6 +164,7 @@ static void error_unexpected_character(char* str, char ch)
     gedcom_lval.tag.string = TO_INTERNAL(yytext, tag_buf);                   \
     gedcom_lval.tag.value  = TAG_##THETAG;                                   \
     BEGIN(NORMAL);                                                           \
+    line_no++;                                                               \
     return TAG_##THETAG;                                                     \
   }
 
@@ -256,12 +261,14 @@ static void error_unexpected_character(char* str, char ch)
 #define ACTION_ALPHANUM                                                       \
    { if (strlen(yytext) > MAXGEDCTAGLEN * encoding_width) {                   \
        error_tag_too_long(yytext);                                            \
+       line_no++;                                                             \
        return BADTOKEN;                                                       \
      }                                                                        \
      CHECK_LINE_LEN;                                                          \
      gedcom_lval.tag.string = TO_INTERNAL(yytext, tag_buf);                   \
      gedcom_lval.tag.value  = USERTAG;                                        \
      BEGIN(NORMAL);                                                           \
+     line_no++;                                                               \
      return USERTAG;                                                          \
    }
 
@@ -323,7 +330,6 @@ static void error_unexpected_character(char* str, char ch)
 #define ACTION_TERMINATOR                                                     \
   { CHECK_LINE_LEN;                                                           \
     INIT_LINE_LEN;                                                            \
-    line_no++;                                                                \
     BEGIN(INITIAL);                                                           \
   }
 
@@ -340,10 +346,7 @@ static void error_unexpected_character(char* str, char ch)
     }                                                                         \
     else {                                                                    \
       char* ptr; int size;                                                    \
-      /* Reset our state */                                                   \
-      current_level = -1;                                                     \
-      level_diff = MAXGEDCLEVEL;                                              \
-      /* ... then terminate lex */                                            \
+      /* ... terminate lex */                                                 \
       yyterminate();                                                          \
       /* Get rid of f*cking compiler warning from lex generated code */       \
       /* yyterminate does return(), so program will never come here  */       \
@@ -376,4 +379,32 @@ static void error_unexpected_character(char* str, char ch)
     return BADTOKEN;                                                          \
   }
 
-#endif /* IN_LEX */
+#elif LEX_SECTION == 3
+
+int yywrap()
+{
+  return 1;
+}
+
+static void yylex_cleanup()
+{
+  /* fix memory leak in lex */
+  yy_delete_buffer(yy_current_buffer);
+  yy_current_buffer = NULL;
+}
+
+static int exitfuncregistered = 0;
+
+void yymyinit(FILE *f)
+{
+  if (! exitfuncregistered && atexit(yylex_cleanup) == 0)
+    exitfuncregistered = 1;
+  yyin = f;
+  yyrestart(f);
+  /* Reset our state */
+  current_level = -1;
+  level_diff = MAXGEDCLEVEL;
+  BEGIN(INITIAL);
+}
+
+#endif