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

1 files changed, 4 insertions, 4 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); }