D29679.diff
No OneTemporary
Actions

Size

33 KB

Referenced Files

None

Subscribers

None

D29679.diff
View Options

	diff --git a/contrib/flex/src/flex.skl b/contrib/flex/src/flex.skl
	--- a/contrib/flex/src/flex.skl
	+++ b/contrib/flex/src/flex.skl
	@@ -216,12 +216,6 @@

	/* First, we deal with platform-specific or compiler-specific issues. */

	-#if defined(__FreeBSD__)
	-#include <sys/cdefs.h>
	-#else
	-#define __dead2
	-#endif
	-
	/* begin standard C headers. */
	%if-c-only
	#include <stdio.h>
	@@ -653,7 +647,7 @@
	static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );
	static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG);
	static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );
	-static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;
	+static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );
	]])

	%endif
	diff --git a/tools/build/bootstrap-m4/inittokenizer.c b/tools/build/bootstrap-m4/inittokenizer.c
	--- a/tools/build/bootstrap-m4/inittokenizer.c
	+++ b/tools/build/bootstrap-m4/inittokenizer.c
	@@ -1,4 +1,6 @@
	+#line 1 "tokenizer.c"

	+#line 3 "tokenizer.c"

	#define YY_INT_ALIGNED short int

	@@ -6,24 +8,14 @@

	#define FLEX_SCANNER
	#define YY_FLEX_MAJOR_VERSION 2
	-#define YY_FLEX_MINOR_VERSION 5
	-#define YY_FLEX_SUBMINOR_VERSION 37
	+#define YY_FLEX_MINOR_VERSION 6
	+#define YY_FLEX_SUBMINOR_VERSION 4
	#if YY_FLEX_SUBMINOR_VERSION > 0
	#define FLEX_BETA
	#endif

	/* First, we deal with platform-specific or compiler-specific issues. */

	-#if defined(__FreeBSD__)
	-#ifndef __STDC_LIMIT_MACROS
	-#define __STDC_LIMIT_MACROS
	-#endif
	-#include <sys/cdefs.h>
	-#include <stdint.h>
	-#else
	-#define __dead2
	-#endif
	-
	/* begin standard C headers. */
	#include <stdio.h>
	#include <string.h>
	@@ -93,65 +85,61 @@
	#define UINT32_MAX (4294967295U)
	#endif

	+#ifndef SIZE_MAX
	+#define SIZE_MAX (~(size_t)0)
	+#endif
	+
	#endif /* ! C99 */

	#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 */
	+/* begin standard C++ headers. */

	-#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_NEW_FILE yyrestart( yyin )
	#define YY_END_OF_BUFFER_CHAR 0

	/* Size of default input buffer. */
	#ifndef YY_BUF_SIZE
	+#ifdef __ia64__
	+/* On IA-64, the buffer size is 16k, not 8k.
	+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
	+ * Ditto for the __ia64__ case accordingly.
	+ */
	+#define YY_BUF_SIZE 32768
	+#else
	#define YY_BUF_SIZE 16384
	+#endif /* __ia64__ */
	#endif

	/* The state buf must be large enough to hold one state per character in the main buffer.
	@@ -168,15 +156,16 @@
	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)

	/* Return all but the first "n" matched characters back to the input stream. */
	#define yyless(n) \
	@@ -191,7 +180,6 @@
	YY_DO_BEFORE_ACTION; /* set up yytext again */ \
	} \
	while ( 0 )
	-
	#define unput(c) yyunput( c, (yytext_ptr) )

	#ifndef YY_STRUCT_YY_BUFFER_STATE
	@@ -206,12 +194,12 @@
	/* 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
	@@ -234,7 +222,7 @@

	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.
	*/
	@@ -262,7 +250,7 @@
	/* 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
	@@ -274,7 +262,6 @@
	? (yy_buffer_stack)[(yy_buffer_stack_top)] \
	: NULL)
	#define yy_current_buffer YY_CURRENT_BUFFER
	-
	/* 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.
	*/
	@@ -282,11 +269,11 @@

	/* 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 */

	@@ -295,85 +282,81 @@
	*/
	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 );
	+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 );
	+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 )

	-#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 ( const char *yy_str );
	+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );

	-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 * );
	+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 ){ \
	yyensure_buffer_stack (); \
	YY_CURRENT_BUFFER_LVALUE = \
	- yy_create_buffer(yyin,YY_BUF_SIZE ); \
	+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
	} \
	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
	}
	-
	#define yy_set_bol(at_bol) \
	{ \
	if ( ! YY_CURRENT_BUFFER ){\
	yyensure_buffer_stack (); \
	YY_CURRENT_BUFFER_LVALUE = \
	- yy_create_buffer(yyin,YY_BUF_SIZE ); \
	+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
	} \
	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
	}
	-
	#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)

	/* Begin user sect3 */

	-#define yywrap() 1
	+#define yywrap() (/CONSTCOND/1)
	#define YY_SKIP_YYWRAP
	+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;
	+#ifdef yytext_ptr
	+#undef yytext_ptr
	+#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 );
	-static void yy_fatal_error (yyconst char msg[] ) __dead2;
	+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; \
	- yyleng = (size_t) (yy_cp - yy_bp); \
	+ yyleng = (int) (yy_cp - yy_bp); \
	(yy_hold_char) = *yy_cp; \
	*yy_cp = '\0'; \
	(yy_c_buf_p) = yy_cp;
	-
	#define YY_NUM_RULES 14
	#define YY_END_OF_BUFFER 15
	/* This struct is not used in this scanner,
	@@ -383,7 +366,7 @@
	flex_int32_t yy_verify;
	flex_int32_t yy_nxt;
	};
	-static yyconst flex_int16_t yy_accept[35] =
	+static const flex_int16_t yy_accept[35] =
	{ 0,
	0, 0, 15, 13, 1, 1, 13, 13, 13, 2,
	2, 13, 13, 13, 13, 1, 9, 10, 12, 2,
	@@ -391,7 +374,7 @@
	2, 0, 3, 0
	} ;

	-static yyconst flex_int32_t yy_ec[256] =
	+static const YY_CHAR yy_ec[256] =
	{ 0,
	1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
	@@ -423,13 +406,13 @@
	1, 1, 1, 1, 1
	} ;

	-static yyconst flex_int32_t yy_meta[19] =
	+static const YY_CHAR yy_meta[19] =
	{ 0,
	1, 1, 1, 1, 1, 1, 2, 2, 2, 1,
	1, 1, 1, 3, 4, 4, 4, 1
	} ;

	-static yyconst flex_int16_t yy_base[39] =
	+static const flex_int16_t yy_base[39] =
	{ 0,
	0, 0, 48, 49, 17, 19, 35, 41, 39, 16,
	0, 14, 32, 15, 25, 27, 49, 49, 49, 27,
	@@ -437,7 +420,7 @@
	0, 0, 0, 49, 39, 29, 34, 36
	} ;

	-static yyconst flex_int16_t yy_def[39] =
	+static const flex_int16_t yy_def[39] =
	{ 0,
	34, 1, 34, 34, 34, 34, 34, 34, 34, 34,
	35, 34, 34, 34, 34, 34, 34, 34, 34, 34,
	@@ -445,7 +428,7 @@
	37, 38, 38, 0, 34, 34, 34, 34
	} ;

	-static yyconst flex_int16_t yy_nxt[68] =
	+static const flex_int16_t yy_nxt[68] =
	{ 0,
	4, 5, 6, 7, 8, 9, 10, 11, 11, 4,
	12, 13, 14, 4, 4, 4, 4, 15, 16, 16,
	@@ -456,7 +439,7 @@
	34, 34, 34, 34, 34, 34, 34
	} ;

	-static yyconst flex_int16_t yy_chk[68] =
	+static const flex_int16_t yy_chk[68] =
	{ 0,
	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
	1, 1, 1, 1, 1, 1, 1, 1, 5, 5,
	@@ -481,7 +464,9 @@
	#define YY_MORE_ADJ 0
	#define YY_RESTORE_YY_MORE_OFFSET
	char *yytext;
	+#line 1 "tokenizer.l"
	#define YY_NO_INPUT 1
	+#line 3 "tokenizer.l"
	/* $OpenBSD: tokenizer.l,v 1.9 2017/06/15 13:48:42 bcallah Exp $ */
	/*
	* Copyright (c) 2004 Marc Espie <espie@cvs.openbsd.org>
	@@ -516,6 +501,8 @@
	extern int yylex(void);

	#define YY_DECL int yylex(void)
	+#line 504 "tokenizer.c"
	+#line 505 "tokenizer.c"

	#define INITIAL 0

	@@ -531,36 +518,36 @@
	#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.
	@@ -568,33 +555,41 @@

	#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
	+
	#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

	/* Amount of stuff to slurp up with each read. */
	#ifndef YY_READ_BUF_SIZE
	+#ifdef __ia64__
	+/* On IA-64, the buffer size is 16k, not 8k */
	+#define YY_READ_BUF_SIZE 16384
	+#else
	#define YY_READ_BUF_SIZE 8192
	+#endif /* __ia64__ */
	#endif

	/* Copy whatever the last rule matched to the standard output. */
	@@ -602,7 +597,7 @@
	/* 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,
	@@ -613,7 +608,7 @@
	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; \
	@@ -626,7 +621,7 @@
	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) \
	{ \
	@@ -681,7 +676,7 @@

	/* Code executed at the end of each rule. */
	#ifndef YY_BREAK
	-#define YY_BREAK break;
	+#define YY_BREAK /LINTED/break;
	#endif

	#define YY_RULE_SETUP \
	@@ -695,8 +690,6 @@
	char yy_cp, yy_bp;
	int yy_act;

	-
	-
	if ( !(yy_init) )
	{
	(yy_init) = 1;
	@@ -717,13 +710,18 @@
	if ( ! YY_CURRENT_BUFFER ) {
	yyensure_buffer_stack ();
	YY_CURRENT_BUFFER_LVALUE =
	- yy_create_buffer(yyin,YY_BUF_SIZE );
	+ yy_create_buffer( yyin, YY_BUF_SIZE );
	}

	- yy_load_buffer_state( );
	+ yy_load_buffer_state( );
	}

	- while ( 1 ) /* loops until end-of-file is reached */
	+ {
	+#line 48 "tokenizer.l"
	+
	+#line 722 "tokenizer.c"
	+
	+ while ( /CONSTCOND/1 ) /* loops until end-of-file is reached */
	{
	yy_cp = (yy_c_buf_p);

	@@ -749,9 +747,9 @@
	{
	yy_current_state = (int) yy_def[yy_current_state];
	if ( yy_current_state >= 35 )
	- 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] != 49 );
	@@ -781,14 +779,17 @@
	case 1:
	/* rule 1 can match eol */
	YY_RULE_SETUP
	+#line 49 "tokenizer.l"
	{/* just skip it */}
	YY_BREAK
	case 2:
	YY_RULE_SETUP
	+#line 50 "tokenizer.l"
	{ yylval = number(); return(NUMBER); }
	YY_BREAK
	case 3:
	YY_RULE_SETUP
	+#line 51 "tokenizer.l"
	{ if (mimic_gnu) {
	yylval = parse_radix(); return(NUMBER);
	} else {
	@@ -798,48 +799,60 @@
	YY_BREAK
	case 4:
	YY_RULE_SETUP
	+#line 57 "tokenizer.l"
	{ return(LE); }
	YY_BREAK
	case 5:
	YY_RULE_SETUP
	+#line 58 "tokenizer.l"
	{ return(GE); }
	YY_BREAK
	case 6:
	YY_RULE_SETUP
	+#line 59 "tokenizer.l"
	{ return(LSHIFT); }
	YY_BREAK
	case 7:
	YY_RULE_SETUP
	+#line 60 "tokenizer.l"
	{ return(RSHIFT); }
	YY_BREAK
	case 8:
	YY_RULE_SETUP
	+#line 61 "tokenizer.l"
	{ return(EQ); }
	YY_BREAK
	case 9:
	YY_RULE_SETUP
	+#line 62 "tokenizer.l"
	{ return(NE); }
	YY_BREAK
	case 10:
	YY_RULE_SETUP
	+#line 63 "tokenizer.l"
	{ return(LAND); }
	YY_BREAK
	case 11:
	YY_RULE_SETUP
	+#line 64 "tokenizer.l"
	{ return(LOR); }
	YY_BREAK
	case 12:
	YY_RULE_SETUP
	+#line 65 "tokenizer.l"
	{ if (mimic_gnu) { return (EXPONENT); } }
	YY_BREAK
	case 13:
	YY_RULE_SETUP
	+#line 66 "tokenizer.l"
	{ return yytext[0]; }
	YY_BREAK
	case 14:
	YY_RULE_SETUP
	+#line 67 "tokenizer.l"
	ECHO;
	YY_BREAK
	+#line 855 "tokenizer.c"
	case YY_STATE_EOF(INITIAL):
	yyterminate();

	@@ -917,7 +930,7 @@
	{
	(yy_did_buffer_switch_on_eof) = 0;

	- if ( yywrap( ) )
	+ if ( yywrap( ) )
	{
	/* Note: because we've taken care in
	* yy_get_next_buffer() to have set up
	@@ -970,6 +983,7 @@
	"fatal flex scanner internal error--no action found" );
	} /* end of action switch */
	} /* end of scanning one token */
	+ } /* end of user's declarations */
	} /* end of yylex */

	/* yy_get_next_buffer - try to read in a new buffer
	@@ -1012,7 +1026,7 @@
	/* Try to read more data. */

	/* First move last chars to start of buffer. */
	- number_to_move = (int) ((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++);
	@@ -1025,7 +1039,7 @@

	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 )
	@@ -1039,7 +1053,7 @@

	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;
	@@ -1048,11 +1062,12 @@

	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(
	@@ -1080,7 +1095,7 @@
	if ( number_to_move == YY_MORE_ADJ )
	{
	ret_val = EOB_ACT_END_OF_FILE;
	- yyrestart(yyin );
	+ yyrestart( yyin );
	}

	else
	@@ -1094,12 +1109,15 @@
	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()" );
	+ /* "- 2" to take care of EOB's */
	+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
	}

	(yy_n_chars) += number_to_move;
	@@ -1132,9 +1150,9 @@
	{
	yy_current_state = (int) yy_def[yy_current_state];
	if ( yy_current_state >= 35 )
	- 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;
	@@ -1160,14 +1178,18 @@
	{
	yy_current_state = (int) yy_def[yy_current_state];
	if ( yy_current_state >= 35 )
	- 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 == 34);

	return yy_is_jam ? 0 : yy_current_state;
	}

	+#ifndef YY_NO_UNPUT
	+
	+#endif
	+
	#ifndef YY_NO_INPUT
	#ifdef __cplusplus
	static int yyinput (void)
	@@ -1192,7 +1214,7 @@

	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( ) )
	@@ -1209,14 +1231,14 @@
	*/

	/* Reset buffer status. */
	- yyrestart(yyin );
	+ yyrestart( yyin );

	/FALLTHROUGH/

	case EOB_ACT_END_OF_FILE:
	{
	- if ( yywrap( ) )
	- return EOF;
	+ if ( yywrap( ) )
	+ return 0;

	if ( ! (yy_did_buffer_switch_on_eof) )
	YY_NEW_FILE;
	@@ -1253,11 +1275,11 @@
	if ( ! YY_CURRENT_BUFFER ){
	yyensure_buffer_stack ();
	YY_CURRENT_BUFFER_LVALUE =
	- yy_create_buffer(yyin,YY_BUF_SIZE );
	+ yy_create_buffer( yyin, YY_BUF_SIZE );
	}

	- yy_init_buffer(YY_CURRENT_BUFFER,input_file );
	- yy_load_buffer_state( );
	+ yy_init_buffer( YY_CURRENT_BUFFER, input_file );
	+ yy_load_buffer_state( );
	}

	/** Switch to a different input buffer.
	@@ -1285,7 +1307,7 @@
	}

	YY_CURRENT_BUFFER_LVALUE = new_buffer;
	- yy_load_buffer_state( );
	+ yy_load_buffer_state( );

	/* We don't actually know whether we did this switch during
	* EOF (yywrap()) processing, but the only time this flag
	@@ -1313,7 +1335,7 @@
	{
	YY_BUFFER_STATE b;

	- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
	+ b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
	if ( ! b )
	YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );

	@@ -1322,13 +1344,13 @@
	/* 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()" );

	b->yy_is_our_buffer = 1;

	- yy_init_buffer(b,file );
	+ yy_init_buffer( b, file );

	return b;
	}
	@@ -1347,9 +1369,9 @@
	YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;

	if ( b->yy_is_our_buffer )
	- yyfree((void *) b->yy_ch_buf );
	+ yyfree( (void *) b->yy_ch_buf );

	- yyfree((void *) b );
	+ yyfree( (void *) b );
	}

	/* Initializes or reinitializes a buffer.
	@@ -1361,7 +1383,7 @@
	{
	int oerrno = errno;

	- yy_flush_buffer(b );
	+ yy_flush_buffer( b );

	b->yy_input_file = file;
	b->yy_fill_buffer = 1;
	@@ -1404,7 +1426,7 @@
	b->yy_buffer_status = YY_BUFFER_NEW;

	if ( b == YY_CURRENT_BUFFER )
	- yy_load_buffer_state( );
	+ yy_load_buffer_state( );
	}

	/** Pushes the new state onto the stack. The new state becomes
	@@ -1435,7 +1457,7 @@
	YY_CURRENT_BUFFER_LVALUE = new_buffer;

	/* copied from yy_switch_to_buffer. */
	- yy_load_buffer_state( );
	+ yy_load_buffer_state( );
	(yy_did_buffer_switch_on_eof) = 1;
	}

	@@ -1454,7 +1476,7 @@
	--(yy_buffer_stack_top);

	if (YY_CURRENT_BUFFER) {
	- yy_load_buffer_state( );
	+ yy_load_buffer_state( );
	(yy_did_buffer_switch_on_eof) = 1;
	}
	}
	@@ -1472,15 +1494,15 @@
	* 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;
	+ 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;
	@@ -1489,7 +1511,7 @@
	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){

	/* Increase the buffer to prepare for a possible push. */
	- int grow_size = 8 /* arbitrary grow size */;
	+ yy_size_t grow_size = 8 /* arbitrary grow size */;

	num_to_alloc = (yy_buffer_stack_max) + grow_size;
	(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
	@@ -1509,7 +1531,7 @@
	* @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 )
	{
	@@ -1519,23 +1541,23 @@
	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 ) );
	+ 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;
	b->yy_fill_buffer = 0;
	b->yy_buffer_status = YY_BUFFER_NEW;

	- yy_switch_to_buffer(b );
	+ yy_switch_to_buffer( b );

	return b;
	}
	@@ -1548,10 +1570,10 @@
	* @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
	@@ -1561,16 +1583,16 @@
	*
	* @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;
	- buf = (char *) yyalloc(n );
	+ n = (yy_size_t) (_yybytes_len + 2);
	+ buf = (char *) yyalloc( n );
	if ( ! buf )
	YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );

	@@ -1579,7 +1601,7 @@

	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;

	- b = yy_scan_buffer(buf,n );
	+ b = yy_scan_buffer( buf, n );
	if ( ! b )
	YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );

	@@ -1595,9 +1617,9 @@
	#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 );
	+ fprintf( stderr, "%s\n", msg );
	exit( YY_EXIT_FAILURE );
	}

	@@ -1625,7 +1647,7 @@
	*/
	int yyget_lineno (void)
	{
	-
	+
	return yylineno;
	}

	@@ -1648,7 +1670,7 @@
	/** Get the length of the current token.
	*
	*/
	-yy_size_t yyget_leng (void)
	+int yyget_leng (void)
	{
	return yyleng;
	}
	@@ -1663,29 +1685,29 @@
	}

	/** Set the current line number.
	- * @param line_number
	+ * @param _line_number line number
	*
	*/
	-void yyset_lineno (int line_number )
	+void yyset_lineno (int _line_number )
	{

	- yylineno = line_number;
	+ yylineno = _line_number;
	}

	/** Set the input stream. This does not discard the current
	* input buffer.
	- * @param in_str A readable stream.
	+ * @param _in_str A readable stream.
	*
	* @see yy_switch_to_buffer
	*/
	-void yyset_in (FILE * in_str )
	+void yyset_in (FILE * _in_str )
	{
	- yyin = in_str ;
	+ yyin = _in_str ;
	}

	-void yyset_out (FILE * out_str )
	+void yyset_out (FILE * _out_str )
	{
	- yyout = out_str ;
	+ yyout = _out_str ;
	}

	int yyget_debug (void)
	@@ -1693,9 +1715,9 @@
	return yy_flex_debug;
	}

	-void yyset_debug (int bdebug )
	+void yyset_debug (int _bdebug )
	{
	- yy_flex_debug = bdebug ;
	+ yy_flex_debug = _bdebug ;
	}

	static int yy_init_globals (void)
	@@ -1704,10 +1726,10 @@
	* 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;

	@@ -1716,8 +1738,8 @@
	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
	@@ -1732,7 +1754,7 @@

	/* Pop the buffer stack, destroying each element. */
	while(YY_CURRENT_BUFFER){
	- yy_delete_buffer(YY_CURRENT_BUFFER );
	+ yy_delete_buffer( YY_CURRENT_BUFFER );
	YY_CURRENT_BUFFER_LVALUE = NULL;
	yypop_buffer_state();
	}
	@@ -1753,8 +1775,9 @@
	*/

	#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;
	for ( i = 0; i < n; ++i )
	s1[i] = s2[i];
	@@ -1762,7 +1785,7 @@
	#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 )
	@@ -1774,11 +1797,12 @@

	void *yyalloc (yy_size_t size )
	{
	- return (void *) malloc( size );
	+ return malloc(size);
	}

	void yyrealloc (void ptr, yy_size_t size )
	{
	+
	/* The cast to (char *) in the following accommodates both
	* implementations that use char* generic pointers, and those
	* that use void* generic pointers. It works with the latter
	@@ -1786,17 +1810,17 @@
	* 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 )
	{
	- free( (char ) ptr ); / see yyrealloc() for (char ) cast /
	+ free( (char ) ptr ); / see yyrealloc() for (char ) cast /
	}

	#define YYTABLES_NAME "yytables"

	-
	+#line 67 "tokenizer.l"


	int32_t
	diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
	--- a/usr.bin/lex/initscan.c
	+++ b/usr.bin/lex/initscan.c
	@@ -15,12 +15,6 @@

	/* First, we deal with platform-specific or compiler-specific issues. */

	-#if defined(__FreeBSD__)
	-#include <sys/cdefs.h>
	-#else
	-#define __dead2
	-#endif
	-
	/* begin standard C headers. */
	#include <stdio.h>
	#include <string.h>
	@@ -348,7 +342,7 @@
	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 ) __dead2;
	+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.
	@@ -1971,9 +1965,9 @@
	if (!indented_code) line_directive_out(NULL, 0);\
	} while (0)

	-#line 1974 "<stdout>"
	+#line 1968 "<stdout>"

	-#line 1976 "<stdout>"
	+#line 1970 "<stdout>"

	#define INITIAL 0
	#define SECT2 1
	@@ -2239,7 +2233,7 @@
	char nmdef[MAXLINE];


	-#line 2242 "<stdout>"
	+#line 2236 "<stdout>"

	while ( /CONSTCOND/1 ) /* loops until end-of-file is reached */
	{
	@@ -4140,7 +4134,7 @@
	#line 1014 "scan.l"
	YY_FATAL_ERROR( "flex scanner jammed" );
	YY_BREAK
	-#line 4143 "<stdout>"
	+#line 4137 "<stdout>"
	case YY_STATE_EOF(INITIAL):
	case YY_STATE_EOF(SECT2):
	case YY_STATE_EOF(CODEBLOCK):
	diff --git a/usr.bin/lex/initskel.c b/usr.bin/lex/initskel.c
	--- a/usr.bin/lex/initskel.c
	+++ b/usr.bin/lex/initskel.c
	@@ -446,12 +446,6 @@
	"",
	"/* First, we deal with platform-specific or compiler-specific issues. */",
	"",
	- "#if defined(__FreeBSD__)",
	- "#include <sys/cdefs.h>",
	- "#else",
	- "#define __dead2",
	- "#endif",
	- "",
	"/* begin standard C headers. */",
	"%if-c-only",
	"#include <stdio.h>",
	@@ -943,7 +937,7 @@
	"static yy_state_type yy_get_previous_state ( M4_YY_PROTO_ONLY_ARG );",
	"static yy_state_type yy_try_NUL_trans ( yy_state_type current_state M4_YY_PROTO_LAST_ARG);",
	"static int yy_get_next_buffer ( M4_YY_PROTO_ONLY_ARG );",
	- "static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG ) __dead2;",
	+ "static void yynoreturn yy_fatal_error ( const char* msg M4_YY_PROTO_LAST_ARG );",
	"]])",
	"",
	"%endif",

File Metadata

Mime Type: text/plain
Expires: Thu, Feb 13, 7:56 AM (21 h, 1 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 16624844
Default Alt Text: D29679.diff (33 KB)

D29679.diffNo OneTemporaryActions

D29679.diffView Options

File Metadata

Event Timeline

D29679.diff
No OneTemporary
Actions

D29679.diff
View Options