{min,max,abs} -> {MIN,MAX,ABS}

7 files changed, 25 insertions, 25 deletions

diff --git a/dfa.c b/dfa.c
index 6ba656e..23a451e 100644
--- a/dfa.c
+++ b/dfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /cvsroot/flex/flex/dfa.c,v 2.16 1993/11/28 16:45:01 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/dfa.c,v 2.17 1993/12/07 10:18:09 vern Exp $ */
 
 #include "flexdef.h"
 
@@ -204,7 +204,7 @@ int state[];
 
 	for ( i = 0; i < csize; ++i )
 		{
-		ec = abs( ecgroup[i] );
+		ec = ABS( ecgroup[i] );
 		out_char_set[i] = state[ec];
 		}
 
@@ -978,7 +978,7 @@ int ds[], dsize, transsym, nset[];
 			{ /* do nothing */
 			}
 
-		else if ( abs( ecgroup[sym] ) == transsym )
+		else if ( ABS( ecgroup[sym] ) == transsym )
 			nset[++numstates] = tsp;
 
 		bottom: ;
diff --git a/ecs.c b/ecs.c
index 6586e7b..e025160 100644
--- a/ecs.c
+++ b/ecs.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /cvsroot/flex/flex/ecs.c,v 2.8 1993/09/16 20:32:09 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/ecs.c,v 2.9 1993/12/07 10:18:20 vern Exp $ */
 
 #include "flexdef.h"
 
@@ -80,7 +80,7 @@ int fwd[], bck[], num;
 
 	numcl = 0;
 
-	/* Create equivalence class numbers.  From now on, abs( bck(x) )
+	/* Create equivalence class numbers.  From now on, ABS( bck(x) )
 	 * is the equivalence class number for object x.  If bck(x)
 	 * is positive, then x is the representative of its equivalence
 	 * class.
diff --git a/flexdef.h b/flexdef.h
index 78219d4..fe4f0cc 100644
--- a/flexdef.h
+++ b/flexdef.h
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* @(#) $Header: /cvsroot/flex/flex/flexdef.h,v 2.30 1993/12/03 21:59:50 vern Exp $ (LBL) */
+/* @(#) $Header: /cvsroot/flex/flex/flexdef.h,v 2.31 1993/12/07 10:18:22 vern Exp $ (LBL) */
 
 #include <stdio.h>
 #include <ctype.h>
@@ -61,14 +61,14 @@
 /* Maximum line length we'll have to deal with. */
 #define MAXLINE 2048
 
-#ifndef min
-#define min(x,y) ((x) < (y) ? (x) : (y))
+#ifndef MIN
+#define MIN(x,y) ((x) < (y) ? (x) : (y))
 #endif
-#ifndef max
-#define max(x,y) ((x) > (y) ? (x) : (y))
+#ifndef MAX
+#define MAX(x,y) ((x) > (y) ? (x) : (y))
 #endif
-#ifndef abs
-#define abs(x) ((x) < 0 ? -(x) : (x))
+#ifndef ABS
+#define ABS(x) ((x) < 0 ? -(x) : (x))
 #endif
 
 
diff --git a/gen.c b/gen.c
index 94a3f98..ef08aa7 100644
--- a/gen.c
+++ b/gen.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /cvsroot/flex/flex/gen.c,v 2.30 1993/12/03 21:59:54 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/gen.c,v 2.31 1993/12/07 10:18:24 vern Exp $ */
 
 #include "flexdef.h"
 
@@ -240,7 +240,7 @@ void genecs()
 		if ( caseins && (i >= 'A') && (i <= 'Z') )
 			ecgroup[i] = ecgroup[clower( i )];
 
-		ecgroup[i] = abs( ecgroup[i] );
+		ecgroup[i] = ABS( ecgroup[i] );
 		mkdata( ecgroup[i] );
 		}
 
@@ -786,7 +786,7 @@ void gentabs()
 		dfaacc[end_of_buffer_state].dfaacc_set = EOB_accepting_list;
 
 		printf( long_align ? C_long_decl : C_short_decl,
-			"yy_acclist", max( numas, 1 ) + 1 );
+			"yy_acclist", MAX( numas, 1 ) + 1 );
 
 		j = 1;	/* index into "yy_acclist" array */
 
@@ -910,9 +910,9 @@ void gentabs()
 			{
 			if ( trace )
 				fprintf( stderr, "%d = %d\n",
-					i, abs( tecbck[i] ) );
+					i, ABS( tecbck[i] ) );
 
-			mkdata( abs( tecbck[i] ) );
+			mkdata( ABS( tecbck[i] ) );
 			}
 
 		dataend();
diff --git a/main.c b/main.c
index 8fc8284..5f120e2 100644
--- a/main.c
+++ b/main.c
@@ -32,7 +32,7 @@ char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-/* $Header: /cvsroot/flex/flex/main.c,v 2.34 1993/12/03 12:50:00 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/main.c,v 2.35 1993/12/07 10:18:26 vern Exp $ */
 
 
 #include "flexdef.h"
@@ -873,7 +873,7 @@ void readin()
 
 	/* Now map the equivalence class for NUL to its expected place. */
 	ecgroup[0] = ecgroup[csize];
-	NUL_ec = abs( ecgroup[0] );
+	NUL_ec = ABS( ecgroup[0] );
 
 	if ( useecs )
 		ccl2ecl();
diff --git a/nfa.c b/nfa.c
index f2994e9..7386708 100644
--- a/nfa.c
+++ b/nfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /cvsroot/flex/flex/nfa.c,v 2.12 1993/12/05 17:08:15 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/nfa.c,v 2.13 1993/12/07 10:18:28 vern Exp $ */
 
 #include "flexdef.h"
 
@@ -301,8 +301,8 @@ int first, last;
 		{
 		mkxtion( finalst[first], last );
 		finalst[first] = finalst[last];
-		lastst[first] = max( lastst[first], lastst[last] );
-		firstst[first] = min( firstst[first], firstst[last] );
+		lastst[first] = MAX( lastst[first], lastst[last] );
+		firstst[first] = MIN( firstst[first], firstst[last] );
 
 		return first;
 		}
diff --git a/tblcmp.c b/tblcmp.c
index f688247..9dfc51d 100644
--- a/tblcmp.c
+++ b/tblcmp.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $Header: /cvsroot/flex/flex/tblcmp.c,v 2.9 1993/09/16 20:32:00 vern Exp $ */
+/* $Header: /cvsroot/flex/flex/tblcmp.c,v 2.10 1993/12/07 10:18:30 vern Exp $ */
 
 #include "flexdef.h"
 
@@ -610,7 +610,7 @@ int numchars, statenum, deflink, totaltrans;
 		/* Ensure that the base address we eventually generate is
 		 * non-negative.
 		 */
-		baseaddr = max( tblend + 1, minec );
+		baseaddr = MAX( tblend + 1, minec );
 		}
 
 	tblbase = baseaddr - minec;
@@ -635,7 +635,7 @@ int numchars, statenum, deflink, totaltrans;
 		for ( ++firstfree; chk[firstfree] != 0; ++firstfree )
 			;
 
-	tblend = max( tblend, tbllast );
+	tblend = MAX( tblend, tbllast );
 	}