X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Flexer.c;h=c71035f4c4f1e8ffcb5d8ba80ca9d154a8767005;hp=24bf871ecac75605e4c4cef24255678dc02bdec4;hb=00d6544408e2de88277e091fb7f8f4dfe3949558;hpb=b879b04a092d5b00cc866cf16f755e55053d2e89

diff --git a/dfa/lexer.c b/dfa/lexer.c
index 24bf871..c71035f 100644
--- a/dfa/lexer.c
+++ b/dfa/lexer.c
@@ -1,37 +1,26 @@
-/*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: lexer.c,v $
- * 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
- * Optimization of grepper.
- *
- * Revision 1.2  1994/09/27  16:31:20  adam
- * First version of grepper: grep with error correction.
- *
- * Revision 1.1  1994/09/26  10:16:55  adam
- * First version of dfa module in alex. This version uses yacc to parse
- * regular expressions. This should be hand-made instead.
- *
- *
- * Adam Dickmeiss.      1992-1993
- * This module is actually very old...
- */
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
+
+Zebra 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, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 
@@ -39,7 +28,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <alexutil.h>
+#include <idzebra/util.h>
 #include <dfa.h>
 #include "imalloc.h"
 #include "lexer.h"
@@ -57,11 +46,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)
@@ -78,13 +62,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;
@@ -123,11 +100,6 @@ int main (int argc, char **argv)
     struct DFA *dfa;
 
     prog = *argv;
-#ifdef YACC
-    yydebug = 0;
-#else
-    alexdebug = 0;
-#endif
     dfa = dfa_init ();
     i = lexer_options (argc, argv);
     if (i)
@@ -143,18 +115,18 @@ int main (int argc, char **argv)
         if (**++argv != '-' && **argv)
         {
             ++no;
-            
+
             i = read_file (*argv, dfa);
             if (i)
                 return i;
             dfa_mkstate (dfa);
 
-#ifdef MEMDEBUG
+#if MEMDEBUG
     imemstat();
 #endif
         }
     dfa_delete (&dfa);
-#ifdef MEMDEBUG
+#if MEMDEBUG
     imemstat();
 #endif
     if (!no)
@@ -165,3 +137,12 @@ int main (int argc, char **argv)
     return 0;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+