Module Name:    src
Committed By:   christos
Date:           Mon Jan  2 18:33:22 UTC 2017

Modified Files:
        src/external/bsd/flex/bin: Makefile
        src/external/bsd/flex/dist/src: initscan.c

Log Message:
fix the scanner build and regen


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/initscan.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.10 src/external/bsd/flex/bin/Makefile:1.11
--- src/external/bsd/flex/bin/Makefile:1.10	Mon Jan  2 12:45:26 2017
+++ src/external/bsd/flex/bin/Makefile	Mon Jan  2 13:33:22 2017
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.4 (Berkeley) 6/24/90
-#	$NetBSD: Makefile,v 1.10 2017/01/02 17:45:26 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2017/01/02 18:33:22 christos Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -55,7 +55,7 @@ LINKS=	${BINDIR}/lex ${BINDIR}/flex \
 MLINKS=	flex.1 lex.1 
 
 skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
-	${TOOL_SED} -e 's/m4_/m4postproc_/g' -e 's/m4preproc_/m4_/g' \
+	${TOOL_SED} -e 's/4_/a4_/g; s/m4preproc_/m4_/g' \
 	    ${IDIST}/flex.skl | ${TOOL_M4} -I${IDIST} -P \
 	    -DFLEX_MAJOR_VERSION=`echo ${VERSION} | cut -f 1 -d .` \
 	    -DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \

Index: src/external/bsd/flex/dist/src/initscan.c
diff -u src/external/bsd/flex/dist/src/initscan.c:1.3 src/external/bsd/flex/dist/src/initscan.c:1.4
--- src/external/bsd/flex/dist/src/initscan.c:1.3	Mon Jan  2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/initscan.c	Mon Jan  2 13:33:22 2017
@@ -1,5 +1,5 @@
 
-#line 3 "<stdout>"
+#line 2 "<stdout>"
 
 #define  YY_INT_ALIGNED short int
 
@@ -8,11 +8,89 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 3
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+    #define yy_create_buffer yy_create_buffer
+
+    #define yy_delete_buffer yy_delete_buffer
+
+    #define yy_scan_buffer yy_scan_buffer
+
+    #define yy_scan_string yy_scan_string
+
+    #define yy_scan_bytes yy_scan_bytes
+
+    #define yy_init_buffer yy_init_buffer
+
+    #define yy_flush_buffer yy_flush_buffer
+
+    #define yy_load_buffer_state yy_load_buffer_state
+
+    #define yy_switch_to_buffer yy_switch_to_buffer
+
+    #define yypush_buffer_state yypush_buffer_state
+
+    #define yypop_buffer_state yypop_buffer_state
+
+    #define yyensure_buffer_stack yyensure_buffer_stack
+
+    #define yylex yylex
+
+    #define yyrestart yyrestart
+
+    #define yylex_init yylex_init
+
+    #define yylex_init_extra yylex_init_extra
+
+    #define yylex_destroy yylex_destroy
+
+    #define yyget_debug yyget_debug
+
+    #define yyset_debug yyset_debug
+
+    #define yyget_extra yyget_extra
+
+    #define yyset_extra yyset_extra
+
+    #define yyget_in yyget_in
+
+    #define yyset_in yyset_in
+
+    #define yyget_out yyget_out
+
+    #define yyset_out yyset_out
+
+    #define yyget_leng yyget_leng
+
+    #define yyget_text yyget_text
+
+    #define yyget_lineno yyget_lineno
+
+    #define yyset_lineno yyset_lineno
+
+    #define yywrap yywrap
+
+    #define yyalloc yyalloc
+
+    #define yyrealloc yyrealloc
+
+    #define yyfree yyfree
+
+    #define yytext yytext
+
+    #define yyleng yyleng
+
+    #define yyin yyin
+
+    #define yyout yyout
+
+    #define yy_flex_debug yy_flex_debug
+
+    #define yylineno yylineno
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -26,7 +104,7 @@
 
 /* end standard C headers. */
 
-/*	$NetBSD: initscan.c,v 1.3 2017/01/02 17:45:27 christos Exp $	*/
+/*	$NetBSD: initscan.c,v 1.4 2017/01/02 18:33:22 christos Exp $	*/
 
 /* flex integer type definitions */
 
@@ -92,56 +170,38 @@ typedef unsigned int flex_uint32_t;
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* 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
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* 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
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
 #define YY_NEW_FILE yyrestart(yyin  )
-
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -171,14 +231,14 @@ typedef struct yy_buffer_state *YY_BUFFE
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
+extern int yyleng;
 
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
     #define YY_LINENO_REWIND_TO(ptr)
     
@@ -195,7 +255,6 @@ extern FILE *yyin, *yyout;
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -210,12 +269,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -238,7 +297,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -266,7 +325,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -277,7 +336,6 @@ static YY_BUFFER_STATE * yy_buffer_stack
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* 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.
  */
@@ -285,11 +343,11 @@ static YY_BUFFER_STATE * yy_buffer_stack
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -298,30 +356,28 @@ static int yy_start = 0;	/* start state 
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
+
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
 #define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
+
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
 #define yy_new_buffer yy_create_buffer
-
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
@@ -331,7 +387,6 @@ void yyfree (void *  );
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
-
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
@@ -341,19 +396,16 @@ void yyfree (void *  );
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
 extern int yylineno;
-
 int yylineno = 1;
 
 extern char *yytext;
@@ -362,25 +414,20 @@ extern char *yytext;
 #endif
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	(yytext_ptr) -= (yy_more_len); \
-	yyleng = (size_t) (yy_cp - (yytext_ptr)); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-
 #define YY_NUM_RULES 253
 #define YY_END_OF_BUFFER 254
 /* This struct is not used in this scanner,
@@ -390,7 +437,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[1114] =
+static const flex_int16_t yy_accept[1114] =
     {   0,
         0,    0,    0,    0,    0,    0,  246,  246,   40,   40,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -517,7 +564,7 @@ static yyconst flex_int16_t yy_accept[11
        80,   59,    0
     } ;
 
-static yyconst YY_CHAR yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         4,    4,    5,    1,    1,    1,    1,    1,    1,    1,
@@ -549,7 +596,7 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[85] =
+static const YY_CHAR yy_meta[85] =
     {   0,
         1,    1,    2,    1,    3,    4,    1,    1,    5,    6,
         1,    7,    8,    9,    1,   10,    1,   11,   12,   12,
@@ -562,7 +609,7 @@ static yyconst YY_CHAR yy_meta[85] =
        15,   20,    1,   21
     } ;
 
-static yyconst flex_uint16_t yy_base[1221] =
+static const flex_int16_t yy_base[1221] =
     {   0,
         0,   84,  167,  250,  171,  184,  135,  142,  220,  231,
       196,  200,  334,    0, 3627, 3625,  211,  416,  203,  212,
@@ -700,7 +747,7 @@ static yyconst flex_uint16_t yy_base[122
      4346, 4367, 3028, 4379, 4398, 4419, 4432, 4447, 4468, 4489
     } ;
 
-static yyconst flex_int16_t yy_def[1221] =
+static const flex_int16_t yy_def[1221] =
     {   0,
      1113, 1113, 1114, 1114, 1115, 1116, 1117, 1117, 1118, 1118,
      1119, 1119, 1113,   13, 1120, 1120, 1121, 1121, 1122, 1122,
@@ -838,7 +885,7 @@ static yyconst flex_int16_t yy_def[1221]
      1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113
     } ;
 
-static yyconst flex_uint16_t yy_nxt[4596] =
+static const flex_int16_t yy_nxt[4596] =
     {   0,
        56,   57,   58,   56,   59,   56,   56,   56,   56,   56,
        56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
@@ -1348,7 +1395,7 @@ static yyconst flex_uint16_t yy_nxt[4596
 
     } ;
 
-static yyconst flex_int16_t yy_chk[4596] =
+static const flex_int16_t yy_chk[4596] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1868,14 +1915,12 @@ int yy_flex_debug = 0;
  * any uses of REJECT which flex missed.
  */
 #define REJECT reject_used_but_not_detected
-static int yy_more_flag = 0;
-static int yy_more_len = 0;
-#define yymore() ((yy_more_flag) = 1)
-#define YY_MORE_ADJ (yy_more_len)
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "/usr/src/external/bsd/flex/dist/src/scan.l"
-/*	$NetBSD: initscan.c,v 1.3 2017/01/02 17:45:27 christos Exp $	*/
+/*	$NetBSD: initscan.c,v 1.4 2017/01/02 18:33:22 christos Exp $	*/
 /* scan.l - scanner for flex input -*-C-*- */
 #line 6 "/usr/src/external/bsd/flex/dist/src/scan.l"
 /*  Copyright (c) 1990 The Regents of the University of California. */
@@ -1909,7 +1954,7 @@ char *yytext;
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
 #include "flexdef.h"
-__RCSID("$NetBSD: initscan.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: initscan.c,v 1.4 2017/01/02 18:33:22 christos Exp $");
 
 #include "parse.h"
 extern bool tablesverify, tablesext;
@@ -1997,16 +2042,9 @@ extern int yylval;	/* XXX: for bootstrap
     if (!indented_code) line_directive_out(NULL, 0);\
 } while (0)
 
+#line 2045 "<stdout>"
 
-
-
-
-
-
-
-
-
-#line 2010 "<stdout>"
+#line 2047 "<stdout>"
 
 #define INITIAL 0
 #define SECT2 1
@@ -2048,36 +2086,36 @@ extern int yylval;	/* XXX: for bootstrap
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy (void );
+int yylex_destroy ( void );
 
-int yyget_debug (void );
+int yyget_debug ( void );
 
-void yyset_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *yyget_in (void );
+FILE *yyget_in ( void );
 
-void yyset_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *yyget_out (void );
+FILE *yyget_out ( void );
 
-void yyset_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t yyget_leng (void );
+			int yyget_leng ( void );
 
-char *yyget_text (void );
+char *yyget_text ( void );
 
-int yyget_lineno (void );
+int yyget_lineno ( void );
 
-void yyset_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -2085,32 +2123,31 @@ void yyset_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int yywrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
 #ifndef YY_NO_UNPUT
     
-    static void yyunput (int c,char *buf_ptr  );
+    static void yyunput ( int c, char *buf_ptr  );
     
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
@@ -2119,9 +2156,9 @@ static int input (void );
         static int yy_start_stack_depth = 0;
         static int *yy_start_stack = NULL;
     
-    static void yy_push_state (int _new_state );
+    static void yy_push_state ( int _new_state );
     
-    static void yy_pop_state (void );
+    static void yy_pop_state ( void );
     
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
@@ -2138,7 +2175,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -2149,7 +2186,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -2162,7 +2199,7 @@ static int input (void );
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -2263,6 +2300,7 @@ YY_DECL
 	{
 #line 162 "/usr/src/external/bsd/flex/dist/src/scan.l"
 
+#line 164 "/usr/src/external/bsd/flex/dist/src/scan.l"
 	static int bracelevel, didadef, indented_code;
 	static int doing_rule_action = false;
 	static int option_sense;
@@ -2272,16 +2310,10 @@ YY_DECL
 	char nmdef[MAXLINE];
 
 
-#line 2276 "<stdout>"
+#line 2313 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
-		(yy_more_len) = 0;
-		if ( (yy_more_flag) )
-			{
-			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
-			(yy_more_flag) = 0;
-			}
 		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
@@ -2307,9 +2339,9 @@ yy_match:
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 1114 )
-					yy_c = yy_meta[(unsigned int) yy_c];
+					yy_c = yy_meta[yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
 		while ( yy_base[yy_current_state] != 4511 );
@@ -2338,39 +2370,39 @@ do_action:	/* This label is used only to
 
 case 1:
 YY_RULE_SETUP
-#line 173 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 174 "/usr/src/external/bsd/flex/dist/src/scan.l"
 START_CODEBLOCK(true);
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 174 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 175 "/usr/src/external/bsd/flex/dist/src/scan.l"
 add_action("/*[""["); yy_push_state( COMMENT );
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 175 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 176 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yy_push_state( LINEDIR );
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 176 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 177 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return SCDECL;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 177 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 178 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return XSCDECL;
 	YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 178 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 179 "/usr/src/external/bsd/flex/dist/src/scan.l"
 START_CODEBLOCK(false);
 	YY_BREAK
 case 7:
 /* rule 7 can match eol */
 YY_RULE_SETUP
-#line 179 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 180 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                 brace_start_line = linenum;
                 ++linenum;
@@ -2381,17 +2413,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 187 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 188 "/usr/src/external/bsd/flex/dist/src/scan.l"
 synerr( _("malformed '%top' directive") );
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 189 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 190 "/usr/src/external/bsd/flex/dist/src/scan.l"
 /* discard */
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 192 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			sectnum = 2;
 			bracelevel = 0;
@@ -2404,42 +2436,42 @@ YY_RULE_SETUP
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 200 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 201 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yytext_is_array = false; ++linenum;
 	YY_BREAK
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 201 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 202 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yytext_is_array = true; ++linenum;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 203 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 204 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(OPTION); return TOK_OPTION;
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 205 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 206 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; /* ignore */
 	YY_BREAK
 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
-#line 206 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 207 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum;	/* ignore */
 	YY_BREAK
 /* xgettext: no-c-format */
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 209 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 210 "/usr/src/external/bsd/flex/dist/src/scan.l"
 synerr( _( "unrecognized '%' directive" ) );
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 211 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 212 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			if(yyleng < MAXLINE)
         		 {
@@ -2457,51 +2489,51 @@ YY_RULE_SETUP
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 226 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 227 "/usr/src/external/bsd/flex/dist/src/scan.l"
 RETURNNAME;
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
-#line 227 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 228 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; /* allows blank lines in section 1 */
 	YY_BREAK
 case 20:
 /* rule 20 can match eol */
 YY_RULE_SETUP
-#line 228 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 229 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; ++linenum; /* maybe end of comment line */
 	YY_BREAK
 
 /* */
 case 21:
 YY_RULE_SETUP
-#line 233 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 234 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 234 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 235 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 236 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 237 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; ACTION_ECHO;
 	YY_BREAK
 
 
 case 24:
 YY_RULE_SETUP
-#line 239 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 240 "/usr/src/external/bsd/flex/dist/src/scan.l"
 add_action("*/]""]"); yy_pop_state();
 	YY_BREAK
 
 
 case 25:
 YY_RULE_SETUP
-#line 242 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 243 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; yy_pop_state();
 	YY_BREAK
 
@@ -2509,41 +2541,41 @@ ACTION_ECHO; yy_pop_state();
 /* This is the same as COMMENT, but is discarded rather than output. */
 case 26:
 YY_RULE_SETUP
-#line 247 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 248 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yy_pop_state();
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 248 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 249 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 249 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 250 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ;
 	YY_BREAK
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
-#line 250 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 251 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum;
 	YY_BREAK
 
 
 case 30:
 YY_RULE_SETUP
-#line 254 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 255 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yy_pop_state();
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 255 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 256 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ;
 	YY_BREAK
 case 32:
 /* rule 32 can match eol */
 YY_RULE_SETUP
-#line 256 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 257 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum;
 	YY_BREAK
 
@@ -2551,17 +2583,17 @@ YY_RULE_SETUP
 case 33:
 /* rule 33 can match eol */
 YY_RULE_SETUP
-#line 260 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 261 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yy_pop_state();
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 261 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 262 "/usr/src/external/bsd/flex/dist/src/scan.l"
 linenum = myctoi( yytext );
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 263 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 264 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			free(infilename);
 			infilename = xstrdup(yytext + 1);
@@ -2570,19 +2602,19 @@ YY_RULE_SETUP
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 268 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 269 "/usr/src/external/bsd/flex/dist/src/scan.l"
 /* ignore spurious characters */
 	YY_BREAK
 
 
 case 37:
 YY_RULE_SETUP
-#line 272 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 273 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO_QSTART;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 273 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 274 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO_QEND;
 	YY_BREAK
 
@@ -2590,23 +2622,23 @@ ACTION_ECHO_QEND;
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
-#line 277 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 278 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; END_CODEBLOCK;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 278 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 279 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 279 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 280 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP
-#line 280 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 281 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			++linenum;
 			ACTION_ECHO;
@@ -2617,7 +2649,7 @@ YY_RULE_SETUP
 
 case 43:
 YY_RULE_SETUP
-#line 288 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 289 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                 if( --brace_depth == 0){
                     /* TODO: Matched. */
@@ -2628,7 +2660,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 296 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 297 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                 brace_depth++;
                 buf_strnappend(&top_buf, yytext, yyleng);
@@ -2637,7 +2669,7 @@ YY_RULE_SETUP
 case 45:
 /* rule 45 can match eol */
 YY_RULE_SETUP
-#line 301 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 302 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                 ++linenum;
                 buf_strnappend(&top_buf, yytext, yyleng);
@@ -2645,23 +2677,23 @@ YY_RULE_SETUP
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 306 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 307 "/usr/src/external/bsd/flex/dist/src/scan.l"
 buf_strnappend(&top_buf, escaped_qstart, (int) strlen(escaped_qstart));
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 307 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 308 "/usr/src/external/bsd/flex/dist/src/scan.l"
 buf_strnappend(&top_buf, escaped_qend, (int) strlen(escaped_qend));
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 308 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 309 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
        buf_strnappend(&top_buf, yytext, yyleng);
     }
 	YY_BREAK
 case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE):
-#line 312 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 313 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                 linenum = brace_start_line;
                 synerr(_("Unmatched '{'"));
@@ -2672,12 +2704,12 @@ case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE)
 
 case 49:
 YY_RULE_SETUP
-#line 321 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 322 "/usr/src/external/bsd/flex/dist/src/scan.l"
 /* separates name and definition */
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 323 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 324 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
  		        if(yyleng < MAXLINE)
  		         {
@@ -2703,7 +2735,7 @@ YY_RULE_SETUP
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-#line 345 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 346 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			if ( ! didadef )
 				synerr( _( "incomplete name definition" ) );
@@ -2716,42 +2748,42 @@ YY_RULE_SETUP
 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP
-#line 355 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 356 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; BEGIN(INITIAL);
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 356 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 357 "/usr/src/external/bsd/flex/dist/src/scan.l"
 option_sense = true;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 358 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 359 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return '=';
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 360 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 361 "/usr/src/external/bsd/flex/dist/src/scan.l"
 option_sense = ! option_sense;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 362 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 363 "/usr/src/external/bsd/flex/dist/src/scan.l"
 csize = option_sense ? 128 : 256;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 363 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 364 "/usr/src/external/bsd/flex/dist/src/scan.l"
 csize = option_sense ? 256 : 128;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 365 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 366 "/usr/src/external/bsd/flex/dist/src/scan.l"
 long_align = option_sense;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 366 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 367 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense );
             interactive = option_sense;
@@ -2759,64 +2791,64 @@ YY_RULE_SETUP
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 370 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 371 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yytext_is_array = option_sense;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 371 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 372 "/usr/src/external/bsd/flex/dist/src/scan.l"
 backing_up_report = option_sense;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 372 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 373 "/usr/src/external/bsd/flex/dist/src/scan.l"
 interactive = ! option_sense;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 373 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 374 "/usr/src/external/bsd/flex/dist/src/scan.l"
 bison_bridge_lval = option_sense;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 374 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 375 "/usr/src/external/bsd/flex/dist/src/scan.l"
 { if((bison_bridge_lloc = option_sense))
                             bison_bridge_lval = true;
                      }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 377 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 378 "/usr/src/external/bsd/flex/dist/src/scan.l"
 C_plus_plus = option_sense;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 378 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 379 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_case_ins(!option_sense);
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 379 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 380 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_case_ins(option_sense);
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 380 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 381 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ddebug = option_sense;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 381 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 382 "/usr/src/external/bsd/flex/dist/src/scan.l"
 spprdflt = ! option_sense;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 382 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 383 "/usr/src/external/bsd/flex/dist/src/scan.l"
 useecs = option_sense;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 383 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 384 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			useecs = usemecs = false;
 			use_read = fullspd = true;
@@ -2824,7 +2856,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 387 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 388 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			useecs = usemecs = false;
 			use_read = fulltbl = true;
@@ -2832,32 +2864,32 @@ YY_RULE_SETUP
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 391 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 392 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_IFDEF("YY_NO_INPUT", ! option_sense);
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 392 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 393 "/usr/src/external/bsd/flex/dist/src/scan.l"
 interactive = option_sense;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 393 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 394 "/usr/src/external/bsd/flex/dist/src/scan.l"
 lex_compat = option_sense;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 394 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 395 "/usr/src/external/bsd/flex/dist/src/scan.l"
 posix_compat = option_sense;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 395 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 396 "/usr/src/external/bsd/flex/dist/src/scan.l"
 gen_line_dirs = option_sense;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 396 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 397 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense);
             /* Override yywrap */
@@ -2867,12 +2899,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 402 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 403 "/usr/src/external/bsd/flex/dist/src/scan.l"
 usemecs = option_sense;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 403 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 404 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense );
             interactive = !option_sense;
@@ -2880,237 +2912,237 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 407 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 408 "/usr/src/external/bsd/flex/dist/src/scan.l"
 performance_report += option_sense ? 1 : -1;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 408 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 409 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yytext_is_array = ! option_sense;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 409 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 410 "/usr/src/external/bsd/flex/dist/src/scan.l"
 use_read = option_sense;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 410 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 411 "/usr/src/external/bsd/flex/dist/src/scan.l"
 reentrant = option_sense;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 411 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 412 "/usr/src/external/bsd/flex/dist/src/scan.l"
 reject_really_used = option_sense;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 412 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 413 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 413 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 414 "/usr/src/external/bsd/flex/dist/src/scan.l"
 do_stdinit = option_sense;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 414 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 415 "/usr/src/external/bsd/flex/dist/src/scan.l"
 use_stdout = option_sense;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 415 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 416 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 416 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 417 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense);
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 417 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 418 "/usr/src/external/bsd/flex/dist/src/scan.l"
 printstats = option_sense;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 418 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 419 "/usr/src/external/bsd/flex/dist/src/scan.l"
 nowarn = ! option_sense;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 419 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 420 "/usr/src/external/bsd/flex/dist/src/scan.l"
 do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense);
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 420 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 421 "/usr/src/external/bsd/flex/dist/src/scan.l"
 yymore_really_used = option_sense;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 421 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 422 "/usr/src/external/bsd/flex/dist/src/scan.l"
 do_yywrap = option_sense;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 423 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 424 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense);
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 424 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 425 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense);
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 425 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 426 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense);
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 427 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 428 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense);
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 428 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 429 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense);
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 429 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 430 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense);
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 431 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 432 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense);
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 432 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 433 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense);
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 433 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 434 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense);
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 435 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 436 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense);
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 436 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 437 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense);
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 437 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 438 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense);
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 438 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 439 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense);
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 439 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 440 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense);
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 440 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 441 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense);
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 441 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 442 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense);
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 442 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 443 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense);
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 443 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 444 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense);
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 444 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 445 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense);
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 445 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 446 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense);
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 446 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 447 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense);
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 447 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 448 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense);
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 448 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 449 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense);
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 449 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 450 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense);
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 450 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 451 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 452 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 453 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_EXTRA_TYPE;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 453 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 454 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_OUTFILE;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 454 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 455 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_PREFIX;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 455 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 456 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_YYCLASS;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 456 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 457 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_HEADER_FILE;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 457 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 458 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return TOK_TABLES_FILE;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 458 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 459 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                     tablesverify = option_sense;
                     if(!tablesext && option_sense)
@@ -3119,7 +3151,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 465 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 466 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			if(yyleng-1 < MAXLINE)
         		 {
@@ -3136,7 +3168,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 479 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 480 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			format_synerr( _( "unrecognized %%option: %s" ),
 				yytext );
@@ -3147,28 +3179,28 @@ YY_RULE_SETUP
 case 130:
 /* rule 130 can match eol */
 YY_RULE_SETUP
-#line 486 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 487 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; BEGIN(INITIAL);
 	YY_BREAK
 
 case 131:
 YY_RULE_SETUP
-#line 490 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 491 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++bracelevel; yyless( 2 );	/* eat only %{ */
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 491 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 492 "/usr/src/external/bsd/flex/dist/src/scan.l"
 --bracelevel; yyless( 2 );	/* eat only %} */
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 493 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 494 "/usr/src/external/bsd/flex/dist/src/scan.l"
 START_CODEBLOCK(true); /* indented code in prolog */
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 495 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 496 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
         /* non-indented code */
 		if ( bracelevel <= 0 ) {
@@ -3184,17 +3216,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 508 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 509 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 136:
 /* rule 136 can match eol */
 YY_RULE_SETUP
-#line 509 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 510 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; ACTION_ECHO;
 	YY_BREAK
 case YY_STATE_EOF(SECT2PROLOG):
-#line 511 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 512 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			mark_prolog();
 			sectnum = 0;
@@ -3206,12 +3238,12 @@ case YY_STATE_EOF(SECT2PROLOG):
 case 137:
 /* rule 137 can match eol */
 YY_RULE_SETUP
-#line 519 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 520 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; /* allow blank lines in section 2 */
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 521 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 522 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			indented_code = false;
 			doing_codeblock = true;
@@ -3221,7 +3253,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 528 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 529 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                         /* Allow "<" to appear in (?x) patterns. */
                         if (!sf_skip_ws())
@@ -3231,12 +3263,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 534 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 535 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return '^';
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 535 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 536 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(QUOTE); return '"';
 	YY_BREAK
 case 142:
@@ -3244,7 +3276,7 @@ case 142:
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 536 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 537 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			BEGIN(NUM);
 			if ( lex_compat || posix_compat )
@@ -3260,12 +3292,12 @@ YY_LINENO_REWIND_TO(yy_bp + 1);
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 543 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 544 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return '$';
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 545 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 546 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			bracelevel = 1;
 			BEGIN(PERCENT_BRACE_ACTION);
@@ -3281,7 +3313,7 @@ YY_RULE_SETUP
 case 145:
 /* rule 145 can match eol */
 YY_RULE_SETUP
-#line 556 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 557 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                         if (sf_skip_ws()){
                             /* We're in the middle of a (?x: ) pattern. */
@@ -3299,7 +3331,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 571 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 572 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 
                 if (sf_skip_ws()){
@@ -3316,12 +3348,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 585 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 586 "/usr/src/external/bsd/flex/dist/src/scan.l"
 /* allow indented rules */ ;
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 587 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 588 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
             if (sf_skip_ws()){
                 /* We're in the middle of a (?x: ) pattern. */
@@ -3347,7 +3379,7 @@ YY_RULE_SETUP
 case 149:
 /* rule 149 can match eol */
 YY_RULE_SETUP
-#line 609 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 610 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
             if (sf_skip_ws()){
                 /* We're in the middle of a (?x: ) pattern. */
@@ -3369,15 +3401,15 @@ YY_RULE_SETUP
 			}
 	YY_BREAK
 case 150:
-#line 630 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 631 "/usr/src/external/bsd/flex/dist/src/scan.l"
 case 151:
 YY_RULE_SETUP
-#line 630 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 631 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return EOF_OP;
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 632 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 633 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			sectnum = 3;
 			BEGIN(no_section3_escape ? SECT3_NOESCAPE : SECT3);
@@ -3388,7 +3420,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 640 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 641 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			int cclval;
 
@@ -3438,12 +3470,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 686 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 687 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return CCL_OP_DIFF;
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 687 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 688 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return CCL_OP_UNION;
 	YY_BREAK
 /* Check for :space: at the end of the rule so we don't
@@ -3453,7 +3485,7 @@ return CCL_OP_UNION;
 case 156:
 /* rule 156 can match eol */
 YY_RULE_SETUP
-#line 694 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 695 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			char *nmdefptr;
             int end_is_ws, end_ch;
@@ -3504,7 +3536,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0';  /
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 742 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 743 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                     if (sf_skip_ws())
                         yy_push_state(COMMENT_DISCARD);
@@ -3517,7 +3549,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 752 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 753 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                     if (lex_compat || posix_compat){
                         /* Push back the "?#" and treat it like a normal parens. */
@@ -3531,7 +3563,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 762 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 763 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                     sf_push();
                     if (lex_compat || posix_compat)
@@ -3544,12 +3576,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 771 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 772 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_push(); return '(';
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 772 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 773 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
                     if (_sf_top_ix > 0) {
                         sf_pop();
@@ -3560,12 +3592,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 780 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 781 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return (unsigned char) yytext[0];
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 781 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 782 "/usr/src/external/bsd/flex/dist/src/scan.l"
 RETURNCHAR;
 	YY_BREAK
 
@@ -3573,17 +3605,17 @@ RETURNCHAR;
 case 164:
 /* rule 164 can match eol */
 YY_RULE_SETUP
-#line 786 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 787 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum;	/* Allow blank lines & continuations */
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 787 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 788 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return (unsigned char) yytext[0];
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 788 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 789 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2); return '>';
 	YY_BREAK
 case 167:
@@ -3591,17 +3623,17 @@ case 167:
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 789 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 790 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CARETISBOL); return '>';
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 790 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 791 "/usr/src/external/bsd/flex/dist/src/scan.l"
 RETURNNAME;
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 791 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 792 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			format_synerr( _( "bad <start condition>: %s" ),
 				yytext );
@@ -3610,24 +3642,24 @@ YY_RULE_SETUP
 
 case 170:
 YY_RULE_SETUP
-#line 797 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 798 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2); return '^';
 	YY_BREAK
 
 case 171:
 YY_RULE_SETUP
-#line 801 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 802 "/usr/src/external/bsd/flex/dist/src/scan.l"
 RETURNCHAR;
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 802 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 803 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2); return '"';
 	YY_BREAK
 case 173:
 /* rule 173 can match eol */
 YY_RULE_SETUP
-#line 804 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 805 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "missing quote" ) );
 			BEGIN(SECT2);
@@ -3639,49 +3671,49 @@ YY_RULE_SETUP
 
 case 174:
 YY_RULE_SETUP
-#line 813 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 814 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2);
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 814 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 815 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(GROUP_MINUS_PARAMS);
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 815 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 816 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_case_ins(1);
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 816 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 817 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_dot_all(1);
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 817 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 818 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_skip_ws(1);
 	YY_BREAK
 
 
 case 179:
 YY_RULE_SETUP
-#line 820 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 821 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2);
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 821 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 822 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_case_ins(0);
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 822 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 823 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_dot_all(0);
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 823 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 824 "/usr/src/external/bsd/flex/dist/src/scan.l"
 sf_set_skip_ws(0);
 	YY_BREAK
 
@@ -3691,7 +3723,7 @@ case 183:
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 827 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 828 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return '^';
 	YY_BREAK
 case 184:
@@ -3699,12 +3731,12 @@ case 184:
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 828 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 829 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return '^';
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 829 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 830 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); RETURNCHAR;
 	YY_BREAK
 
@@ -3714,23 +3746,23 @@ case 186:
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 833 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 834 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return '-';
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 834 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 835 "/usr/src/external/bsd/flex/dist/src/scan.l"
 RETURNCHAR;
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 835 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 836 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(SECT2); return ']';
 	YY_BREAK
 case 189:
 /* rule 189 can match eol */
 YY_RULE_SETUP
-#line 836 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 837 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "bad character class" ) );
 			BEGIN(SECT2);
@@ -3741,127 +3773,127 @@ YY_RULE_SETUP
 
 case 190:
 YY_RULE_SETUP
-#line 844 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 845 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_ALNUM;
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
-#line 845 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 846 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_ALPHA;
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 846 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 847 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_BLANK;
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
-#line 847 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 848 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_CNTRL;
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
-#line 848 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 849 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_DIGIT;
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
-#line 849 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 850 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_GRAPH;
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
-#line 850 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 851 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_LOWER;
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
-#line 851 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 852 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_PRINT;
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
-#line 852 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 853 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_PUNCT;
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
-#line 853 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 854 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_SPACE;
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
-#line 854 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 855 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_UPPER;
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 855 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 856 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_XDIGIT;
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
-#line 857 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 858 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_ALNUM;
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
-#line 858 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 859 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_ALPHA;
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 859 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 860 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_BLANK;
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
-#line 860 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 861 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_CNTRL;
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
-#line 861 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 862 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_DIGIT;
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
-#line 862 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 863 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_GRAPH;
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
-#line 863 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 864 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_LOWER;
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
-#line 864 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 865 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_PRINT;
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
-#line 865 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 866 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_PUNCT;
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
-#line 866 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 867 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_SPACE;
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
-#line 867 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 868 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_UPPER;
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
-#line 868 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 869 "/usr/src/external/bsd/flex/dist/src/scan.l"
 BEGIN(CCL); return CCE_NEG_XDIGIT;
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
-#line 869 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 870 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			format_synerr(
 				_( "bad character class expression: %s" ),
@@ -3873,7 +3905,7 @@ YY_RULE_SETUP
 
 case 215:
 YY_RULE_SETUP
-#line 878 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 879 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			yylval = myctoi( yytext );
 			return NUMBER;
@@ -3881,12 +3913,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
-#line 883 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 884 "/usr/src/external/bsd/flex/dist/src/scan.l"
 return ',';
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
-#line 884 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 885 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			BEGIN(SECT2);
 			if ( lex_compat || posix_compat )
@@ -3897,7 +3929,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 218:
 YY_RULE_SETUP
-#line 892 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 893 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "bad character inside {}'s" ) );
 			BEGIN(SECT2);
@@ -3907,7 +3939,7 @@ YY_RULE_SETUP
 case 219:
 /* rule 219 can match eol */
 YY_RULE_SETUP
-#line 898 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 899 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "missing }" ) );
 			BEGIN(SECT2);
@@ -3919,18 +3951,18 @@ YY_RULE_SETUP
 
 case 220:
 YY_RULE_SETUP
-#line 908 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 909 "/usr/src/external/bsd/flex/dist/src/scan.l"
 bracelevel = 0;
 	YY_BREAK
 case 221:
 YY_RULE_SETUP
-#line 910 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 911 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; yy_push_state( CODE_COMMENT );
 	YY_BREAK
 
 case 222:
 YY_RULE_SETUP
-#line 913 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 914 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
             ACTION_ECHO;
             CHECK_REJECT(yytext);
@@ -3938,7 +3970,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 223:
 YY_RULE_SETUP
-#line 917 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 918 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
             ACTION_ECHO;
             CHECK_YYMORE(yytext);
@@ -3947,13 +3979,13 @@ YY_RULE_SETUP
 
 case 224:
 YY_RULE_SETUP
-#line 923 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 924 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 225:
 /* rule 225 can match eol */
 YY_RULE_SETUP
-#line 924 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 925 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 		++linenum;
 		ACTION_ECHO;
@@ -3971,43 +4003,43 @@ YY_RULE_SETUP
 
 case 226:
 YY_RULE_SETUP
-#line 940 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 941 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; ++bracelevel;
 	YY_BREAK
 case 227:
 YY_RULE_SETUP
-#line 941 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 942 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; --bracelevel;
 	YY_BREAK
 case 228:
 YY_RULE_SETUP
-#line 942 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 943 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 229:
 YY_RULE_SETUP
-#line 943 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 944 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 230:
 YY_RULE_SETUP
-#line 944 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 945 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; /* character constant */
 	YY_BREAK
 case 231:
 YY_RULE_SETUP
-#line 945 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 946 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; BEGIN(CHARACTER_CONSTANT);
 	YY_BREAK
 case 232:
 YY_RULE_SETUP
-#line 946 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 947 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; BEGIN(ACTION_STRING);
 	YY_BREAK
 case 233:
 /* rule 233 can match eol */
 YY_RULE_SETUP
-#line 947 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 948 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			++linenum;
 			ACTION_ECHO;
@@ -4022,31 +4054,31 @@ YY_RULE_SETUP
 	YY_BREAK
 case 234:
 YY_RULE_SETUP
-#line 958 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 959 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 
 
 case 235:
 YY_RULE_SETUP
-#line 962 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 963 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 236:
 YY_RULE_SETUP
-#line 963 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 964 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; BEGIN(ACTION);
 	YY_BREAK
 
 
 case 237:
 YY_RULE_SETUP
-#line 966 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 967 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 238:
 YY_RULE_SETUP
-#line 967 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 968 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO; BEGIN(ACTION);
 	YY_BREAK
 
@@ -4054,24 +4086,24 @@ ACTION_ECHO; BEGIN(ACTION);
 case 239:
 /* rule 239 can match eol */
 YY_RULE_SETUP
-#line 970 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 971 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 240:
 /* rule 240 can match eol */
 YY_RULE_SETUP
-#line 971 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 972 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 case 241:
 /* rule 241 can match eol */
 YY_RULE_SETUP
-#line 972 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 973 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ++linenum; ACTION_ECHO; BEGIN(ACTION);
 	YY_BREAK
 case 242:
 YY_RULE_SETUP
-#line 973 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 974 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ACTION_ECHO;
 	YY_BREAK
 
@@ -4081,7 +4113,7 @@ case YY_STATE_EOF(COMMENT_DISCARD):
 case YY_STATE_EOF(ACTION):
 case YY_STATE_EOF(ACTION_STRING):
 case YY_STATE_EOF(CHARACTER_CONSTANT):
-#line 976 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 977 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "EOF encountered inside an action" ) );
 			yyterminate();
@@ -4090,7 +4122,7 @@ case YY_STATE_EOF(CHARACTER_CONSTANT):
 case YY_STATE_EOF(EXTENDED_COMMENT):
 case YY_STATE_EOF(GROUP_WITH_PARAMS):
 case YY_STATE_EOF(GROUP_MINUS_PARAMS):
-#line 981 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 982 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			synerr( _( "EOF encountered inside pattern" ) );
 			yyterminate();
@@ -4098,7 +4130,7 @@ case YY_STATE_EOF(GROUP_MINUS_PARAMS):
 	YY_BREAK
 case 243:
 YY_RULE_SETUP
-#line 986 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 987 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
 			yylval = myesc( (unsigned char *) yytext );
 
@@ -4111,27 +4143,27 @@ YY_RULE_SETUP
 
 case 244:
 YY_RULE_SETUP
-#line 996 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 997 "/usr/src/external/bsd/flex/dist/src/scan.l"
 fputs(escaped_qstart, yyout);
 	YY_BREAK
 case 245:
 YY_RULE_SETUP
-#line 997 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 998 "/usr/src/external/bsd/flex/dist/src/scan.l"
 fputs(escaped_qend, yyout);
 	YY_BREAK
 case 246:
 /* rule 246 can match eol */
 YY_RULE_SETUP
-#line 998 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 999 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ECHO;
 	YY_BREAK
 case 247:
 YY_RULE_SETUP
-#line 999 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1000 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(SECT3):
-#line 1000 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1001 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
         sectnum = 0;
         yyterminate();
@@ -4141,27 +4173,27 @@ case YY_STATE_EOF(SECT3):
 
 case 248:
 YY_RULE_SETUP
-#line 1006 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1007 "/usr/src/external/bsd/flex/dist/src/scan.l"
 fprintf(yyout, "[""[%s]""]", escaped_qstart);
 	YY_BREAK
 case 249:
 YY_RULE_SETUP
-#line 1007 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1008 "/usr/src/external/bsd/flex/dist/src/scan.l"
 fprintf(yyout, "[""[%s]""]", escaped_qend);
 	YY_BREAK
 case 250:
 /* rule 250 can match eol */
 YY_RULE_SETUP
-#line 1008 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1009 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ECHO;
 	YY_BREAK
 case 251:
 YY_RULE_SETUP
-#line 1009 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1010 "/usr/src/external/bsd/flex/dist/src/scan.l"
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(SECT3_NOESCAPE):
-#line 1010 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1011 "/usr/src/external/bsd/flex/dist/src/scan.l"
 {
        sectnum = 0;
        yyterminate();
@@ -4171,15 +4203,15 @@ case YY_STATE_EOF(SECT3_NOESCAPE):
 case 252:
 /* rule 252 can match eol */
 YY_RULE_SETUP
-#line 1015 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1016 "/usr/src/external/bsd/flex/dist/src/scan.l"
 format_synerr( _( "bad character: %s" ), yytext );
 	YY_BREAK
 case 253:
 YY_RULE_SETUP
-#line 1017 "/usr/src/external/bsd/flex/dist/src/scan.l"
+#line 1018 "/usr/src/external/bsd/flex/dist/src/scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 4183 "<stdout>"
+#line 4214 "<stdout>"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(SECT2):
 case YY_STATE_EOF(CODEBLOCK):
@@ -4337,7 +4369,7 @@ static int yy_get_next_buffer (void)
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
-	yy_size_t number_to_move, i;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -4366,7 +4398,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -4379,7 +4411,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -4393,7 +4425,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -4402,11 +4434,11 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yyrealloc((void *) b->yy_ch_buf,(yy_size_t) (b->yy_buf_size + 2)  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -4448,10 +4480,10 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,(yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
 	}
@@ -4487,9 +4519,9 @@ static int yy_get_next_buffer (void)
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 1114 )
-				yy_c = yy_meta[(unsigned int) yy_c];
+				yy_c = yy_meta[yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 		}
 
 	return yy_current_state;
@@ -4515,9 +4547,9 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 1114 )
-			yy_c = yy_meta[(unsigned int) yy_c];
+			yy_c = yy_meta[yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 	yy_is_jam = (yy_current_state == 1113);
 
 		return yy_is_jam ? 0 : yy_current_state;
@@ -4537,7 +4569,7 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		yy_size_t number_to_move = (yy_n_chars) + 2;
+		int number_to_move = (yy_n_chars) + 2;
 		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		char *source =
@@ -4549,7 +4581,7 @@ static int yy_get_next_buffer (void)
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+			(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
 		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -4588,7 +4620,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -4612,7 +4644,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( yywrap( ) )
-						return EOF;
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -4715,12 +4747,12 @@ static void yy_load_buffer_state  (void)
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = (yy_size_t)size;
+	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yyalloc((yy_size_t) (b->yy_buf_size + 2)  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -4870,15 +4902,15 @@ static void yyensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
 			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -4907,7 +4939,7 @@ static void yyensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
@@ -4917,16 +4949,16 @@ YY_BUFFER_STATE yy_scan_buffer  (char * 
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
@@ -4946,10 +4978,10 @@ YY_BUFFER_STATE yy_scan_buffer  (char * 
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
     
-	return yy_scan_bytes(yystr,strlen(yystr) );
+	return yy_scan_bytes(yystr,(int) strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
@@ -4959,15 +4991,15 @@ YY_BUFFER_STATE yy_scan_string (yyconst 
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
+	n = (yy_size_t) (_yybytes_len + 2);
 	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -4996,7 +5028,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst 
 		yy_size_t new_size;
 
 		(yy_start_stack_depth) += YY_START_STACK_INCR;
-		new_size = (yy_start_stack_depth) * sizeof( int );
+		new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int );
 
 		if ( ! (yy_start_stack) )
 			(yy_start_stack) = (int *) yyalloc(new_size  );
@@ -5025,7 +5057,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst 
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
 			(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
@@ -5055,7 +5087,7 @@ static void yy_fatal_error (yyconst char
  */
 int yyget_lineno  (void)
 {
-        
+    
     return yylineno;
 }
 
@@ -5078,7 +5110,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t yyget_leng  (void)
+int yyget_leng  (void)
 {
         return yyleng;
 }
@@ -5134,10 +5166,10 @@ static int yy_init_globals (void)
      * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -5150,8 +5182,8 @@ static int yy_init_globals (void)
     yyin = stdin;
     yyout = stdout;
 #else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
@@ -5191,7 +5223,7 @@ int yylex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
 		
 	int i;
@@ -5201,7 +5233,7 @@ static void yy_flex_strncpy (char* s1, y
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -5213,7 +5245,7 @@ static int yy_flex_strlen (yyconst char 
 
 void *yyalloc (yy_size_t  size )
 {
-			return (void *) malloc( size );
+			return malloc(size);
 }
 
 void *yyrealloc  (void * ptr, yy_size_t  size )
@@ -5226,7 +5258,7 @@ void *yyrealloc  (void * ptr, yy_size_t 
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
 void yyfree (void * ptr )
@@ -5236,8 +5268,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 1017 "/usr/src/external/bsd/flex/dist/src/scan.l"
-
+#line 1018 "/usr/src/external/bsd/flex/dist/src/scan.l"
 
 
 

Reply via email to