X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom_1byte.lex;h=a4a5659df39a24977b2a067da5bffea39a304a50;hb=c75da58b11b6b5f18e1d3f2200aa1e2f9ba5ac64;hp=b7c1d16875ee03a531a4365efc03cfa2bc5ff44a;hpb=b4557a98f5842835e9e65370fd062b6d65af0b14;p=gedcom-parse.git

diff --git a/gedcom_1byte.lex b/gedcom_1byte.lex
index b7c1d16..a4a5659 100644
--- a/gedcom_1byte.lex
+++ b/gedcom_1byte.lex
@@ -11,12 +11,10 @@
 /* $Name$ */
 
 %{
-#include "gedcom.tab.h"
-#include "gedcom.h"
-#include "multilex.h"
-#include "encoding.h"
+#undef IN_LEX    /* include only a specific part of the following file */
+#include "gedcom_lex_common.c"
 
-#define YY_NO_UNPUT
+static size_t encoding_width = 1;
 %}
 
 %s NORMAL
@@ -40,27 +38,17 @@ gen_delim    {delim}|{tab}
 escape       @#{any_char}+@
 pointer      @{alphanum}{non_at}+@
 
-%{
-static int current_level=-1;
-static int level_diff=MAXGEDCLEVEL;
- 
-#ifdef LEXER_TEST 
-YYSTYPE gedcom_lval;
-int line_no = 1; 
-#endif
- 
-%} 
-
 %%
 
 %{
+#define IN_LEX    /* include only a specific part of the following file */
 #include "gedcom_lex_common.c"
 
 ACTION_BEFORE_REGEXPS
   
 %}
 
-<INITIAL>{gen_delim}* /* ignore leading whitespace (also tabs) */
+<INITIAL>{gen_delim}* ACTION_INITIAL_WHITESPACE
 
 <INITIAL>0{digit}+    ACTION_0_DIGITS
 
@@ -220,34 +208,13 @@ int yywrap()
 }
 
 #ifdef LEXER_TEST
+int gedcom_lex()
+{
+  return gedcom_1byte_lex();
+}
+
 int main()
 {
-  int tok, res;
-  init_encodings();
-  set_encoding_width(ONE_BYTE);
-  res = open_conv_to_internal("ASCII");
-  if (!res) {
-    gedcom_error("Unable to open conversion context: %s",
-		 strerror(errno));
-    return 1;
-  }
-  tok = gedcom_1byte_lex();
-  while (tok) {
-    switch(tok) {
-      case BADTOKEN: printf("BADTOKEN "); break;
-      case OPEN: printf("OPEN(%d) ", gedcom_lval.level); break;
-      case CLOSE: printf("CLOSE "); break;
-      case ESCAPE: printf("ESCAPE(%s) ", gedcom_lval.string); break;
-      case DELIM: printf("DELIM "); break;
-      case ANYCHAR: printf("%s ", gedcom_lval.string); break;
-      case POINTER: printf("POINTER(%s) ", gedcom_lval.pointer); break;
-      case USERTAG: printf("USERTAG(%s) ", gedcom_lval.tag); break;
-      default: printf("TAG(%s) ", gedcom_lval.tag); break;
-    }
-    tok = gedcom_1byte_lex();
-  }
-  printf("\n");
-  close_conv_to_internal();
-  return 0;
+  return test_loop(ONE_BYTE, "ASCII");
 }
 #endif