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

diff --git a/src/parse.y b/src/parse.y
index ffe3c7325596a1bb8ba8fc67e05102093ba112fd..c4dfbba7da467ce5da981b4245fa7bf72c9a9f76 100644 (file)
--- 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 148d7d9efedc27f5a4157f65a3616da380a513bb..73ed109c6f24a7c3fc203c35a2a5fc0343e159c2 100644 (file)
--- 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 17b3e61b19eb96ee689f3c21a044793713aa1c66..9fc54ffa651158321f628e9518d64a5f030283d5 100644 (file)
--- 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 8d372b991e5720cf109f9d1d8009bcea65542c77..cfb9ee47c2d55501abacf241b8eff3d69779a8f9 100644 (file)
--- 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 );