Renamed some internal variables.

diff --git a/flex.skl b/flex.skl
index 3254cbd85a20c97b3f9f433b0c51cd59be237e1b..1e077953e76a70d6fd8592ba8e369a09098cf093 100644 (file)
--- a/flex.skl
+++ b/flex.skl
@@ -120,13 +120,13 @@ m4preproc_define(`M4_GEN_PREFIX',
     M4_GEN_PREFIX(`wrap')
 %endif
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     M4_GEN_PREFIX(`get_lval')
     M4_GEN_PREFIX(`set_lval')
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     M4_GEN_PREFIX(`get_lloc')
     M4_GEN_PREFIX(`set_lloc')
@@ -368,7 +368,7 @@ m4_ifdef( [[M4_YY_NO_ANSI_FUNC_DEFS]],
     m4_define( [[YYFARGS3]], [[($1 $2, $3 $4, $5 $6 M4_YY_DEF_LAST_ARG)]])
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
@@ -377,7 +377,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
 #define BEGIN YY_G(yy_start) = 1 + 2 *
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
@@ -387,24 +387,24 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
 #define YYSTATE YY_START
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Special action meaning "start processing a new file". */
 #define YY_NEW_FILE yyrestart( yyin M4_YY_CALL_LAST_ARG )
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define YY_END_OF_BUFFER_CHAR 0
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
@@ -435,7 +435,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 #define EOB_ACT_LAST_MATCH 2
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
     m4_ifdef( [[M4_YY_USE_LINENO]],
     [[
@@ -459,7 +459,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
     ]])
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -476,7 +476,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
        while ( 0 )
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define unput(c) yyunput( c, YY_G(yytext_ptr) M4_YY_CALL_LAST_ARG )
 ]])
@@ -577,7 +577,7 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 %ok-for-header
 %endif
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -590,7 +590,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
                           : NULL)
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
@@ -627,14 +627,14 @@ void yy_flush_buffer M4_YY_PARAMS( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG );
 void yypush_buffer_state M4_YY_PARAMS( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG );
 void yypop_buffer_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 static void yyensure_buffer_stack M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 static void yy_load_buffer_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 static void yy_init_buffer M4_YY_PARAMS( YY_BUFFER_STATE b, FILE *file M4_YY_PROTO_LAST_ARG );
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER M4_YY_CALL_LAST_ARG)
 ]])
@@ -649,12 +649,12 @@ void *yyalloc M4_YY_PARAMS( yy_size_t M4_YY_PROTO_LAST_ARG );
 void *yyrealloc M4_YY_PARAMS( void *, yy_size_t M4_YY_PROTO_LAST_ARG );
 void yyfree M4_YY_PARAMS( void * M4_YY_PROTO_LAST_ARG );
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define yy_new_buffer yy_create_buffer
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define yy_set_interactive(is_interactive) \
        { \
@@ -667,7 +667,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
        }
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define yy_set_bol(at_bol) \
        { \
@@ -680,7 +680,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
        }
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 ]])
@@ -689,7 +689,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
 
 %if-c-only Standard (non-C++) definition
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 static yy_state_type yy_get_previous_state M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 static yy_state_type yy_try_NUL_trans M4_YY_PARAMS( yy_state_type current_state  M4_YY_PROTO_LAST_ARG);
@@ -699,7 +699,7 @@ static void yy_fatal_error M4_YY_PARAMS( yyconst char msg[] M4_YY_PROTO_LAST_ARG
 
 %endif
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
@@ -713,7 +713,7 @@ m4_ifdef( [[M4_YY_IN_HEADER]],,
        YY_G(yy_c_buf_p) = yy_cp;
 ]])
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 %% [4.0] data tables for the DFA and the user's section 1 definitions go here
 ]])
@@ -743,7 +743,7 @@ m4_ifdef( [[M4_YY_NO_UNISTD_H]],,
 %if-c-only Reentrant structure and macros (non-C++).
 %if-reentrant
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
 /* Holds the entire state of the reentrant scanner. */
 struct yyguts_t
@@ -794,12 +794,12 @@ m4_ifdef( [[M4_YY_TEXT_IS_ARRAY]],
     int yy_more_len;
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     YYSTYPE * yylval_r;
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     YYLTYPE * yylloc_r;
 ]])
@@ -815,16 +815,16 @@ static int yy_init_globals M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 
 %if-reentrant
 
-m4_ifdef( [[M4_YY_IN_HEADER]],,
+m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
 [[
-    m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+    m4_ifdef( [[M4_YY_BISON_LVAL]],
     [[
     /* This must go here because YYSTYPE and YYLTYPE are included
      * from bison output in section 1.*/
     #    define yylval YY_G(yylval_r)
     ]])
 
-    m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+    m4_ifdef( [[<M4_YY_BISON_LLOC>]],
     [[
     #    define yylloc YY_G(yylloc_r)
     ]])
@@ -908,7 +908,7 @@ YYSTYPE * yyget_lval M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 
 void yyset_lval M4_YY_PARAMS( YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG );
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     m4_ifdef( [[M4_YY_NO_GET_LLOC]],,
     [[
@@ -969,9 +969,9 @@ static int input M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
 m4_ifdef( [[M4_YY_STACK_USED]],
 [[
 
-m4_ifdef( [[M4_YY_REENTRANT]],,
+m4_ifdef( [[M4_YY_NOT_REENTRANT]],
 [[
-    m4_ifdef( [[M4_YY_IN_HEADER]],,
+    m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
     [[
         static int yy_start_stack_ptr = 0;
         static int yy_start_stack_depth = 0;
@@ -1119,7 +1119,7 @@ struct yytbl_reader {
 m4_define( [[M4_YY_LEX_PROTO]], [[M4_YY_PARAMS(M4_YY_PROTO_ONLY_ARG)]])
 m4_define( [[M4_YY_LEX_DECLARATION]], [[YYFARGS0(void)]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     m4_dnl  The bison pure parser is used. Redefine yylex to
     m4_dnl  accept the lval parameter.
@@ -1130,7 +1130,7 @@ m4_ifdef( [[M4_YY_BISON_BRIDGE]],
                [[YYFARGS1(YYSTYPE *,yylval_param)]])
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     m4_dnl  Locations are used. yylex should also accept the ylloc parameter.
 
@@ -1182,13 +1182,13 @@ YY_DECL
        register int yy_act;
     M4_YY_DECL_GUTS_VAR();
 
-m4_ifdef( [[M4_YY_REENTRANT]],,
+m4_ifdef( [[M4_YY_NOT_REENTRANT]],
 [[
-    m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+    m4_ifdef( [[M4_YY_BISON_LVAL]],
     [[
         YYSTYPE * yylval;
     ]])
-    m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+    m4_ifdef( [[<M4_YY_BISON_LLOC>]],
     [[
         YYLTYPE * yylloc;
     ]])
@@ -1196,12 +1196,12 @@ m4_ifdef( [[M4_YY_REENTRANT]],,
 
 %% [7.0] user's declarations go here
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE]],
+m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     yylval = yylval_param;
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     yylloc = yylloc_param;
 ]])
@@ -2642,7 +2642,7 @@ void yyset_lval YYFARGS1( YYSTYPE * ,yylval_param)
 }
 ]])
 
-m4_ifdef( [[M4_YY_BISON_BRIDGE_LOCATIONS]],
+m4_ifdef( [[<M4_YY_BISON_LLOC>]],
 [[
     m4_ifdef( [[M4_YY_NO_GET_LLOC]],,
     [[

diff --git a/flexdef.h b/flexdef.h
index facc266ef44262dc7500362ad08f669c8f0b6c0e..b50bbd5453faee87046cee92c3ebbddb1aec920c 100644 (file)
--- a/flexdef.h
+++ b/flexdef.h
@@ -352,8 +352,8 @@
  * C_plus_plus - if true (i.e., -+ flag), generate a C++ scanner class;
  *   otherwise, a standard C scanner
  * reentrant - if true (-R), generate a reentrant C scanner.
- * bison_bridge - if true (--bison-bridge), bison pure calling convention.
- * bison_bridge_locations - if true (--bison-locations), bison yylloc.
+ * bison_bridge_lval - if true (--bison-bridge), bison pure calling convention.
+ * bison_bridge_lloc - if true (--bison-locations), bison yylloc.
  * long_align - if true (-Ca flag), favor long-word alignment.
  * use_read - if true (-f, -F, or -Cr) then use read() for scanner input;
  *   otherwise, use fread().
@@ -380,7 +380,7 @@ extern int printstats, syntaxerror, eofseen, ddebug, trace, nowarn,
 extern int interactive, caseins, lex_compat, posix_compat, do_yylineno;
 extern int useecs, fulltbl, usemecs, fullspd;
 extern int gen_line_dirs, performance_report, backing_up_report;
-extern int reentrant, bison_bridge, bison_bridge_locations;
+extern int reentrant, bison_bridge_lval, bison_bridge_lloc;
 extern bool ansi_func_defs, ansi_func_protos;
 extern int C_plus_plus, long_align, use_read, yytext_is_array, do_yywrap;
 extern int csize;

diff --git a/main.c b/main.c
index 748dfe9850f434e87eab4f7895b55f7e837a28d5..1c1722f7720851733e519f949b054fd9b34659a7 100644 (file)
--- a/main.c
+++ b/main.c
@@ -54,7 +54,7 @@ int     interactive, caseins, lex_compat, posix_compat, do_yylineno,
 int     fullspd, gen_line_dirs, performance_report, backing_up_report;
 int     C_plus_plus, long_align, use_read, yytext_is_array, do_yywrap,
        csize;
-int     reentrant, bison_bridge, bison_bridge_locations;
+int     reentrant, bison_bridge_lval, bison_bridge_lloc;
 int     yymore_used, reject, real_reject, continued_action, in_rule;
 int     yymore_really_used, reject_really_used;
 int     datapos, dataline, linenum, out_linenum;
@@ -219,7 +219,7 @@ void check_options ()
                if (fulltbl || fullspd)
                        flexerror (_("Can't use -f or -F with -l option"));
 
-               if (reentrant || bison_bridge)
+               if (reentrant || bison_bridge_lval)
                        flexerror (_
                                   ("Can't use --reentrant or --bison-bridge with -l option"));
 
@@ -284,7 +284,7 @@ void check_options ()
        if (C_plus_plus && (reentrant))
                flexerror (_("Options -+ and --reentrant are mutually exclusive."));
 
-       if (C_plus_plus && bison_bridge)
+       if (C_plus_plus && bison_bridge_lval)
                flexerror (_("bison bridge not supported for the C++ scanner."));
 
 
@@ -407,11 +407,11 @@ void check_options ()
                        buf_m4_define (&m4defs_buf, "M4_YY_TEXT_IS_ARRAY", NULL);
        }
 
-       if ( bison_bridge)
-               buf_m4_define (&m4defs_buf, "M4_YY_BISON_BRIDGE", NULL);
+       if ( bison_bridge_lval)
+               buf_m4_define (&m4defs_buf, "M4_YY_BISON_LVAL", NULL);
 
-       if ( bison_bridge_locations)
-        buf_m4_define (&m4defs_buf, "M4_YY_BISON_BRIDGE_LOCATIONS", NULL);
+       if ( bison_bridge_lloc)
+        buf_m4_define (&m4defs_buf, "<M4_YY_BISON_LLOC>", NULL);
 
     buf_m4_define(&m4defs_buf, "M4_YY_PREFIX", prefix);
 
@@ -736,9 +736,9 @@ void flexend (exit_status)
                        putc ('s', stderr);
                if (reentrant)
                        fputs ("--reentrant", stderr);
-        if (bison_bridge)
+        if (bison_bridge_lval)
             fputs ("--bison-bridge", stderr);
-        if (bison_bridge_locations)
+        if (bison_bridge_lloc)
             fputs ("--bison-locations", stderr);
                if (use_stdout)
                        putc ('t', stderr);
@@ -921,7 +921,7 @@ void flexinit (argc, argv)
        yymore_really_used = reject_really_used = unspecified;
        interactive = csize = unspecified;
        do_yywrap = gen_line_dirs = usemecs = useecs = true;
-       reentrant = bison_bridge = bison_bridge_locations = false;
+       reentrant = bison_bridge_lval = bison_bridge_lloc = false;
        performance_report = 0;
        did_outfilename = 0;
        prefix = "yy";
@@ -1110,11 +1110,11 @@ void flexinit (argc, argv)
                        break;
 
                case OPT_BISON_BRIDGE:
-                       bison_bridge = true;
+                       bison_bridge_lval = true;
                        break;
 
                case OPT_BISON_BRIDGE_LOCATIONS:
-                       bison_bridge = bison_bridge_locations = true;
+                       bison_bridge_lval = bison_bridge_lloc = true;
                        break;
 
                case OPT_REENTRANT:

diff --git a/misc.c b/misc.c
index 153e4b85d82db12317fb9248b4c13d642600b6b7..238843705fbdcef932c8b252c1ec28026460d181 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -952,11 +952,11 @@ void skelout ()
             }
             else if (cmd_match(CMD_IF_BISON_BRIDGE)){
                 sko_push(do_copy);
-                do_copy = bison_bridge && do_copy;
+                do_copy = bison_bridge_lval && do_copy;
             }
             else if (cmd_match(CMD_IF_NOT_BISON_BRIDGE)){
                 sko_push(do_copy);
-                do_copy = !bison_bridge && do_copy;
+                do_copy = !bison_bridge_lval && do_copy;
             }
             else if (cmd_match (CMD_ENDIF)){
                 sko_pop(&do_copy);

diff --git a/scan.l b/scan.l
index ab48a4042d114ceb7d53d44948a17d56ddd91282..fced0b875c455a46efa8c8134db12a39ffdff79b 100644 (file)
--- a/scan.l
+++ b/scan.l
@@ -309,9 +309,9 @@ LEXOPT              [aceknopr]
     ansi-prototypes  ansi_func_protos = option_sense;
        backup          backing_up_report = option_sense;
        batch           interactive = ! option_sense;
-    bison-bridge     bison_bridge = option_sense;
-    bison-locations  { if((bison_bridge_locations = option_sense))
-                            bison_bridge = true;
+    bison-bridge     bison_bridge_lval = option_sense;
+    bison-locations  { if((bison_bridge_lloc = option_sense))
+                            bison_bridge_lval = true;
                      }
        "c++"           C_plus_plus = option_sense;
        caseful|case-sensitive          caseins = ! option_sense;