From 804efe8c42f692d0756b197e3cc013a09b329383 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 28 Feb 2016 14:17:36 +0100
Subject: [PATCH] fix name clash, OPT_OUTFILE from parse.y and from options.h

these collide:
  OPT_OUTFILE OPT_PREFIX OPT_YYCLASS
rename them TOK_... in the parser
---
 src/parse.y          | 8 ++++----
 src/scan.l           | 6 +++---
 src/yylex.c          | 4 ++--
 to.do/unicode/scan.l | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/parse.y b/src/parse.y
index ffe3c73..c4dfbba 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1,7 +1,7 @@
 /* parse.y - parser for flex input */
 
 %token CHAR NUMBER SECTEND SCDECL XSCDECL NAME PREVCCL EOF_OP
-%token OPTION_OP OPT_OUTFILE OPT_PREFIX OPT_YYCLASS OPT_HEADER OPT_EXTRA_TYPE
+%token OPTION_OP TOK_OUTFILE TOK_PREFIX TOK_YYCLASS OPT_HEADER OPT_EXTRA_TYPE
 %token OPT_TABLES
 
 %token CCE_ALNUM CCE_ALPHA CCE_BLANK CCE_CNTRL CCE_DIGIT CCE_GRAPH
@@ -191,16 +191,16 @@ optionlist	:  optionlist option
 		|
 		;
 
-option		:  OPT_OUTFILE '=' NAME
+option		:  TOK_OUTFILE '=' NAME
 			{
 			outfilename = xstrdup(nmstr);
 			did_outfilename = 1;
 			}
 		|  OPT_EXTRA_TYPE '=' NAME
 			{ extra_type = xstrdup(nmstr); }
-		|  OPT_PREFIX '=' NAME
+		|  TOK_PREFIX '=' NAME
 			{ prefix = xstrdup(nmstr); }
-		|  OPT_YYCLASS '=' NAME
+		|  TOK_YYCLASS '=' NAME
 			{ yyclass = xstrdup(nmstr); }
 		|  OPT_HEADER '=' NAME
 			{ headerfilename = xstrdup(nmstr); }
diff --git a/src/scan.l b/src/scan.l
index 148d7d9..73ed109 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -422,9 +422,9 @@ M4QEND      "]]"
     yyset_lloc      ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
 
 	extra-type	return OPT_EXTRA_TYPE;
-	outfile		return OPT_OUTFILE;
-	prefix		return OPT_PREFIX;
-	yyclass		return OPT_YYCLASS;
+	outfile		return TOK_OUTFILE;
+	prefix		return TOK_PREFIX;
+	yyclass		return TOK_YYCLASS;
 	header(-file)?      return OPT_HEADER;
 	tables-file         return OPT_TABLES;
 	tables-verify   {
diff --git a/src/yylex.c b/src/yylex.c
index 17b3e61..9fc54ff 100644
--- a/src/yylex.c
+++ b/src/yylex.c
@@ -178,8 +178,8 @@ int     yylex (void)
 			fprintf (stderr, "%s ", yytext);
 			break;
 
-		case OPT_OUTFILE:
-		case OPT_PREFIX:
+		case TOK_OUTFILE:
+		case TOK_PREFIX:
 		case CCE_ALNUM:
 		case CCE_ALPHA:
 		case CCE_BLANK:
diff --git a/to.do/unicode/scan.l b/to.do/unicode/scan.l
index 8d372b9..cfb9ee4 100644
--- a/to.do/unicode/scan.l
+++ b/to.do/unicode/scan.l
@@ -273,9 +273,9 @@ LEXOPT		[aceknopr]
 	yy_scan_bytes	ACTION_IFDEF("YY_NO_SCAN_BYTES", ! option_sense);
 	yy_scan_string	ACTION_IFDEF("YY_NO_SCAN_STRING", ! option_sense);
 
-	outfile		return OPT_OUTFILE;
-	prefix		return OPT_PREFIX;
-	yyclass		return OPT_YYCLASS;
+	outfile		return TOK_OUTFILE;
+	prefix		return TOK_PREFIX;
+	yyclass		return TOK_YYCLASS;
 
 	\"[^"\n]*\"	{
 			strcpy( nmstr, yytext + 1 );
-- 
2.40.0