X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dfa%2Flexer.c;h=f42ebdaa944342723384c004b879af16261e49d5;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=b4c592d01920fd8fb34e4de263d12bd1ec3248bc;hpb=1b29b77f09ae310c41f9cd0a6eeea2d562b7729e;p=idzebra-moved-to-github.git

diff --git a/dfa/lexer.c b/dfa/lexer.c
index b4c592d..f42ebda 100644
--- a/dfa/lexer.c
+++ b/dfa/lexer.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lexer.c,v $
- * Revision 1.4  1994-10-04 17:46:44  adam
+ * Revision 1.8  1995-09-28 09:18:54  adam
+ * Removed various preprocessor defines.
+ *
+ * Revision 1.7  1995/09/04  12:33:27  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.6  1995/01/25  11:30:51  adam
+ * Simple error reporting when parsing regular expressions.
+ * Memory usage reduced.
+ *
+ * Revision 1.5  1995/01/24  16:00:22  adam
+ * Added -ansi to CFLAGS.
+ * Some changes to the dfa module.
+ *
+ * Revision 1.4  1994/10/04  17:46:44  adam
  * Function options now returns arg with error option.
  *
  * Revision 1.3  1994/10/03  17:22:19  adam
@@ -28,7 +42,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <util.h>
+#include <alexutil.h>
 #include <dfa.h>
 #include "imalloc.h"
 #include "lexer.h"
@@ -46,11 +60,6 @@ void error (const char *format, ...)
     exit (1);
 }
 
-#ifdef YACC
-extern int yydebug;
-#else
-extern int alexdebug;
-#endif
 int ccluse = 0;
 
 static int lexer_options (int argc, char **argv)
@@ -67,13 +76,6 @@ static int lexer_options (int argc, char **argv)
                 case 's':
                     dfa_verbose = 1;
                     continue;
-                case 't':
-#ifdef YACC
-                    yydebug = 1;
-#else
-                    alexdebug = 1;
-#endif
-                    continue;
 	        case 'c':
                     ccluse = 1;
                     continue;
@@ -109,15 +111,10 @@ static int lexer_options (int argc, char **argv)
 int main (int argc, char **argv)
 {
     int i, no = 0;
-    DFA *dfa;
-    DFA_states *dfas;
+    struct DFA *dfa;
 
     prog = *argv;
-#ifdef YACC
-    yydebug = 0;
-#else
-    alexdebug = 0;
-#endif
+    dfa = dfa_init ();
     i = lexer_options (argc, argv);
     if (i)
         return i;
@@ -132,13 +129,17 @@ int main (int argc, char **argv)
         if (**++argv != '-' && **argv)
         {
             ++no;
-            i = read_file (*argv, &dfa);
+            
+            i = read_file (*argv, dfa);
             if (i)
                 return i;
-            dfas = mk_dfas (dfa, 2000);
-            rm_dfa (&dfa);
-            rm_dfas (&dfas);
+            dfa_mkstate (dfa);
+
+#ifdef MEMDEBUG
+    imemstat();
+#endif
         }
+    dfa_delete (&dfa);
 #ifdef MEMDEBUG
     imemstat();
 #endif