d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flex: Regen bootstrap files

Browse Source 
This also partially reverts r326025 (8a16b7a18f).  I do not see any
point of adding SPDX tag in generated file.

MFC after:	3 days
Submitted by:	Dan McGregor <dan.mcgregor@usask.ca> (initial version)
Differential Revision:	https://reviews.freebsd.org/D28596
This commit is contained in:
Jung-uk Kim 2021-04-19 14:20:51 -04:00
parent 22b2ba4e22
commit 686cf5468c
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/lex/initparse.c
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
/* original parser id follows */ /* original parser id follows */
/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */ /* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */
/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */
@ -6,7 +5,7 @@
#define YYBYACC 1 #define YYBYACC 1
#define YYMAJOR 1 #define YYMAJOR 1
#define YYMINOR 9 #define YYMINOR 9
#define YYPATCH 20170430 #define YYPATCH 20200330
#define YYEMPTY (-1) #define YYEMPTY (-1)
#define yyclearin (yychar = YYEMPTY) #define yyclearin (yychar = YYEMPTY)
@ -19,8 +18,6 @@
#define YYPURE 0 #define YYPURE 0
#line 35 "parse.y" #line 35 "parse.y"
/* SPDX-License-Identifier: BSD-2-Clause */
/* Copyright (c) 1990 The Regents of the University of California. */ /* Copyright (c) 1990 The Regents of the University of California. */
/* All rights reserved. */ /* All rights reserved. */
@ -130,6 +127,10 @@ typedef int YYSTYPE;
# define YYLEX yylex() # define YYLEX yylex()
#endif #endif
#if !(defined(yylex) || defined(YYSTATE))
int YYLEX_DECL();
#endif
/* Parameters sent to yyerror. */ /* Parameters sent to yyerror. */
#ifndef YYERROR_DECL #ifndef YYERROR_DECL
#define YYERROR_DECL() yyerror(const char *s) #define YYERROR_DECL() yyerror(const char *s)
@ -488,13 +489,15 @@ static const char *const yyrule[] = {
}; };
#endif #endif
#if YYDEBUG
int yydebug; int yydebug;
int yynerrs; #endif
int yyerrflag; int yyerrflag;
int yychar; int yychar;
YYSTYPE yyval; YYSTYPE yyval;
YYSTYPE yylval; YYSTYPE yylval;
int yynerrs;
/* define the initial stack-sizes */ /* define the initial stack-sizes */
#ifdef YYSTACKSIZE #ifdef YYSTACKSIZE
@ -655,7 +658,7 @@ void yyerror( const char *msg )
{ {
(void)msg; (void)msg;
} }
#line 656 "parse.c" #line 662 "parse.c"
#if YYDEBUG #if YYDEBUG
#include <stdio.h> /* needed for printf */ #include <stdio.h> /* needed for printf */
@ -1781,7 +1784,7 @@ case 96:
#line 946 "parse.y" #line 946 "parse.y"
{ yyval = mkstate( SYM_EPSILON ); } { yyval = mkstate( SYM_EPSILON ); }
break; break;
#line 1782 "parse.c" #line 1788 "parse.c"
} }
yystack.s_mark -= yym; yystack.s_mark -= yym;
yystate = *yystack.s_mark; yystate = *yystack.s_mark;

1
usr.bin/lex/initparse.h
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
#define CHAR 257 #define CHAR 257
#define NUMBER 258 #define NUMBER 258
#define SECTEND 259 #define SECTEND 259

5
usr.bin/lex/initscan.c
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
#line 2 "<stdout>" #line 2 "<stdout>"
@ -4578,7 +4577,11 @@ static int yy_get_next_buffer (void)
case EOB_ACT_END_OF_FILE: case EOB_ACT_END_OF_FILE:
{ {
if ( yywrap( ) ) if ( yywrap( ) )
#ifdef YY_FLEX_LEX_COMPAT
return 0; return 0;
#else
return EOF;
#endif
if ( ! (yy_did_buffer_switch_on_eof) ) if ( ! (yy_did_buffer_switch_on_eof) )
YY_NEW_FILE; YY_NEW_FILE;

9
usr.bin/lex/initskel.c
View File

@ -1,4 +1,3 @@
/* $FreeBSD$ */
/* File created from flex.skl via mkskel.sh */ /* File created from flex.skl via mkskel.sh */
#include "flexdef.h" #include "flexdef.h"
@ -448,11 +447,7 @@ const char *skel[] = {
"/* First, we deal with platform-specific or compiler-specific issues. */", "/* First, we deal with platform-specific or compiler-specific issues. */",
"", "",
"#if defined(__FreeBSD__)", "#if defined(__FreeBSD__)",
"#ifndef __STDC_LIMIT_MACROS",
"#define __STDC_LIMIT_MACROS",
"#endif",
"#include <sys/cdefs.h>", "#include <sys/cdefs.h>",
"#include <stdint.h>",
"#else", "#else",
"#define __dead2", "#define __dead2",
"#endif", "#endif",
@ -2301,7 +2296,11 @@ const char *skel[] = {
" case EOB_ACT_END_OF_FILE:", " case EOB_ACT_END_OF_FILE:",
" {", " {",
" if ( yywrap( M4_YY_CALL_ONLY_ARG ) )", " if ( yywrap( M4_YY_CALL_ONLY_ARG ) )",
"#ifdef YY_FLEX_LEX_COMPAT",
" return 0;", " return 0;",
"#else",
" return EOF;",
"#endif",
"", "",
" if ( ! YY_G(yy_did_buffer_switch_on_eof) )", " if ( ! YY_G(yy_did_buffer_switch_on_eof) )",
" YY_NEW_FILE;", " YY_NEW_FILE;",