From cf67c63195045b4ba4d535d8df5129732aab215d Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 28 Sep 1995 09:18:50 +0000
Subject: [PATCH] Removed various preprocessor defines.

---
 dfa/Makefile |    4 ++--
 dfa/agrep.c  |   29 ++++-------------------------
 dfa/dfa.c    |    6 ++++--
 dfa/lexer.c  |   22 ++++------------------
 4 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/dfa/Makefile b/dfa/Makefile
index efe65d5..6f14f02 100644
--- a/dfa/Makefile
+++ b/dfa/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.9 1995-09-15 09:32:08 adam Exp $
+# $Id: Makefile,v 1.10 1995-09-28 09:18:50 adam Exp $
 
 SHELL=/bin/sh
 RANLIB=ranlib
@@ -11,7 +11,7 @@ INCLUDE=-I../include -I$(YAZ)/include
 TPROG1=agrep
 TPROG2=lexer
 TPROG3=grepper
-DEFS=$(INCLUDE) -DYACC -DYYDEBUG=1 -DMEMDEBUG=1
+DEFS=$(INCLUDE) -DMEMDEBUG=1
 LIB=../lib/dfa.a 
 PO = dfa.o imalloc.o states.o set.o bset.o
 CPP=cc -E
diff --git a/dfa/agrep.c b/dfa/agrep.c
index 1f23dc5..81835d0 100644
--- a/dfa/agrep.c
+++ b/dfa/agrep.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: agrep.c,v $
- * Revision 1.5  1995-09-04 12:33:25  adam
+ * Revision 1.6  1995-09-28 09:18:51  adam
+ * Removed various preprocessor defines.
+ *
+ * Revision 1.5  1995/09/04  12:33:25  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.4  1995/01/24  16:00:21  adam
@@ -54,14 +57,6 @@ void error (const char *format, ...)
     exit (1);
 }
 
-#ifdef YYDEBUG
-#ifdef YACC
-extern int yydebug;
-#else
-extern int alexdebug;
-#endif
-#endif
-
 static int show_lines = 0;
 
 int agrep_options (argc, argv)
@@ -83,15 +78,6 @@ char **argv;
                 case 'n':
                     show_lines = 1;
                     continue;
-#ifdef YYDEBUG
-                case 't':
-#ifdef YACC
-                    yydebug = 1;
-#else
-                    alexdebug = 1;
-#endif
-                    continue;
-#endif
                 case 'd':
                     switch (*++*argv)
                     {
@@ -255,13 +241,6 @@ char **argv;
     struct DFA *dfa = dfa_init();
 
     prog = *argv;
-#ifdef YYDEBUG
-#ifdef YACC
-    yydebug = 0;
-#else
-    alexdebug = 0;
-#endif
-#endif
     setbuf (stdout, outbuf);
     i = agrep_options (argc, argv);
     if (i)
diff --git a/dfa/dfa.c b/dfa/dfa.c
index 9ce116b..fa69d5b 100644
--- a/dfa/dfa.c
+++ b/dfa/dfa.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dfa.c,v $
- * Revision 1.3  1995-09-04 12:33:26  adam
+ * Revision 1.4  1995-09-28 09:18:52  adam
+ * Removed various preprocessor defines.
+ *
+ * Revision 1.3  1995/09/04  12:33:26  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.2  1995/01/25  11:30:50  adam
@@ -60,7 +63,6 @@ int debug_dfa_trav  = 0;
 int debug_dfa_tran  = 0;
 int debug_dfa_followpos = 0;
 int dfa_verbose = 0;
-int yydebug = 0;
 
 static struct DFA_parse *parse_info = NULL;
 
diff --git a/dfa/lexer.c b/dfa/lexer.c
index 24bf871..f42ebda 100644
--- a/dfa/lexer.c
+++ b/dfa/lexer.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lexer.c,v $
- * Revision 1.7  1995-09-04 12:33:27  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
@@ -57,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)
@@ -78,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;
@@ -123,11 +114,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)
-- 
1.7.10.4