Update yacc and lex generated files

Use the FreeBSD 11.1 yacc and lex tools to generate the files.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-28 12:00:46 +02:00
parent 100e66f560
commit fa3e012fc6
5 changed files with 632 additions and 812 deletions

View File

@@ -1,6 +1,8 @@
#line 2 "nslexer.c"
#line 3 "<stdout>"
#line 4 "nslexer.c"
#define YY_BUF_SIZE 1024
#define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */
@@ -171,7 +173,7 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
#define YY_BUF_SIZE 1024
#define YY_BUF_SIZE 16384
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -531,8 +533,8 @@ int _nsyy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *_nsyytext;
#line 1 "../../freebsd/lib/libc/net/nslexer.l"
#line 2 "../../freebsd/lib/libc/net/nslexer.l"
#line 1 "nslexer.l"
#line 2 "nslexer.l"
/* $NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $ */
/*-
@@ -581,7 +583,7 @@ static char *rcsid =
#include "nsparser.h"
#define YY_NO_INPUT 1
#line 585 "<stdout>"
#line 587 "nslexer.c"
#define INITIAL 0
@@ -761,10 +763,10 @@ YY_DECL
char *yy_cp, *yy_bp;
int yy_act;
#line 59 "../../freebsd/lib/libc/net/nslexer.l"
#line 59 "nslexer.l"
#line 768 "<stdout>"
#line 770 "nslexer.c"
if ( !(yy_init) )
{
@@ -859,59 +861,59 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
#line 61 "../../freebsd/lib/libc/net/nslexer.l"
#line 61 "nslexer.l"
; /* skip whitespace */
YY_BREAK
case 2:
YY_RULE_SETUP
#line 63 "../../freebsd/lib/libc/net/nslexer.l"
#line 63 "nslexer.l"
; /* skip comments */
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
#line 65 "../../freebsd/lib/libc/net/nslexer.l"
#line 65 "nslexer.l"
; /* allow continuation */
YY_BREAK
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
#line 67 "../../freebsd/lib/libc/net/nslexer.l"
#line 67 "nslexer.l"
return NL;
YY_BREAK
case 5:
YY_RULE_SETUP
#line 69 "../../freebsd/lib/libc/net/nslexer.l"
#line 69 "nslexer.l"
return SUCCESS;
YY_BREAK
case 6:
YY_RULE_SETUP
#line 70 "../../freebsd/lib/libc/net/nslexer.l"
#line 70 "nslexer.l"
return UNAVAIL;
YY_BREAK
case 7:
YY_RULE_SETUP
#line 71 "../../freebsd/lib/libc/net/nslexer.l"
#line 71 "nslexer.l"
return NOTFOUND;
YY_BREAK
case 8:
YY_RULE_SETUP
#line 72 "../../freebsd/lib/libc/net/nslexer.l"
#line 72 "nslexer.l"
return TRYAGAIN;
YY_BREAK
case 9:
YY_RULE_SETUP
#line 74 "../../freebsd/lib/libc/net/nslexer.l"
#line 74 "nslexer.l"
return RETURN;
YY_BREAK
case 10:
YY_RULE_SETUP
#line 75 "../../freebsd/lib/libc/net/nslexer.l"
#line 75 "nslexer.l"
return CONTINUE;
YY_BREAK
case 11:
YY_RULE_SETUP
#line 77 "../../freebsd/lib/libc/net/nslexer.l"
#line 77 "nslexer.l"
{
char *p;
int i;
@@ -931,15 +933,15 @@ YY_RULE_SETUP
YY_BREAK
case 12:
YY_RULE_SETUP
#line 94 "../../freebsd/lib/libc/net/nslexer.l"
#line 94 "nslexer.l"
return _nsyytext[0];
YY_BREAK
case 13:
YY_RULE_SETUP
#line 96 "../../freebsd/lib/libc/net/nslexer.l"
#line 96 "nslexer.l"
ECHO;
YY_BREAK
#line 943 "<stdout>"
#line 945 "nslexer.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1904,7 +1906,7 @@ void _nsyyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 96 "../../freebsd/lib/libc/net/nslexer.l"
#line 96 "nslexer.l"

View File

@@ -5,7 +5,7 @@
#define YYBYACC 1
#define YYMAJOR 1
#define YYMINOR 9
#define YYPATCH 20160324
#define YYPATCH 20170201
#define YYEMPTY (-1)
#define yyclearin (yychar = YYEMPTY)
@@ -97,7 +97,7 @@
#define YYPURE 0
#line 2 "../../freebsd/lib/libc/net/nsparser.y"
#line 2 "nsparser.y"
/* $NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $ */
/*-
@@ -145,19 +145,19 @@ static void _nsaddsrctomap(const char *);
static ns_dbt curdbt;
static ns_src cursrc;
#line 51 "../../freebsd/lib/libc/net/nsparser.y"
#ifdef YYSTYPE
#undef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
#endif
#ifndef YYSTYPE_IS_DECLARED
#define YYSTYPE_IS_DECLARED 1
#line 51 "nsparser.y"
typedef union {
char *str;
int mapval;
} YYSTYPE;
#endif /* !YYSTYPE_IS_DECLARED */
#line 161 "_nsyy.tab.c"
#line 161 "nsparser.c"
/* compatibility with bison */
#ifdef YYPARSE_PARAM
@@ -356,7 +356,7 @@ typedef struct {
} YYSTACKDATA;
/* variables for the parser stack */
static YYSTACKDATA yystack;
#line 146 "../../freebsd/lib/libc/net/nsparser.y"
#line 146 "nsparser.y"
static void
_nsaddsrctomap(const char *elem)
@@ -389,10 +389,10 @@ _nsaddsrctomap(const char *elem)
cursrc.name = elem;
_nsdbtaddsrc(&curdbt, &cursrc);
}
#line 393 "_nsyy.tab.c"
#line 393 "nsparser.c"
#if YYDEBUG
#include <stdio.h> /* needed for printf */
#include <stdio.h> /* needed for printf */
#endif
#include <stdlib.h> /* needed for malloc, etc */
@@ -464,6 +464,8 @@ YYPARSE_DECL()
}
#endif
yym = 0;
yyn = 0;
yynerrs = 0;
yyerrflag = 0;
yychar = YYEMPTY;
@@ -483,28 +485,26 @@ yyloop:
if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
if (yychar < 0)
{
if ((yychar = YYLEX) < 0) yychar = YYEOF;
yychar = YYLEX;
if (yychar < 0) yychar = YYEOF;
#if YYDEBUG
if (yydebug)
{
yys = yyname[YYTRANSLATE(yychar)];
if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
#endif
}
if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, shifting to state %d\n",
YYPREFIX, yystate, yytable[yyn]);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
yystate = yytable[yyn];
*++yystack.s_mark = yytable[yyn];
*++yystack.l_mark = yylval;
@@ -512,18 +512,17 @@ yyloop:
if (yyerrflag > 0) --yyerrflag;
goto yyloop;
}
if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
if (((yyn = yyrindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
{
yyn = yytable[yyn];
goto yyreduce;
}
if (yyerrflag) goto yyinrecovery;
if (yyerrflag != 0) goto yyinrecovery;
YYERROR_CALL("syntax error");
goto yyerrlab;
goto yyerrlab; /* redundant goto avoids 'unused label' warning */
yyerrlab:
++yynerrs;
@@ -533,18 +532,15 @@ yyinrecovery:
yyerrflag = 3;
for (;;)
{
if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
if (((yyn = yysindex[*yystack.s_mark]) != 0) && (yyn += YYERRCODE) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) YYERRCODE)
{
#if YYDEBUG
if (yydebug)
printf("%sdebug: state %d, error recovery shifting\
to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
yystate = yytable[yyn];
*++yystack.s_mark = yytable[yyn];
*++yystack.l_mark = yylval;
@@ -569,7 +565,7 @@ yyinrecovery:
#if YYDEBUG
if (yydebug)
{
yys = yyname[YYTRANSLATE(yychar)];
if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
YYPREFIX, yystate, yychar, yys);
}
@@ -585,32 +581,33 @@ yyreduce:
YYPREFIX, yystate, yyn, yyrule[yyn]);
#endif
yym = yylen[yyn];
if (yym)
if (yym > 0)
yyval = yystack.l_mark[1-yym];
else
memset(&yyval, 0, sizeof yyval);
switch (yyn)
{
case 6:
#line 79 "../../freebsd/lib/libc/net/nsparser.y"
#line 79 "nsparser.y"
{
free((char*)curdbt.name);
}
break;
case 7:
#line 83 "../../freebsd/lib/libc/net/nsparser.y"
#line 83 "nsparser.y"
{
_nsdbtput(&curdbt);
}
break;
case 8:
#line 87 "../../freebsd/lib/libc/net/nsparser.y"
#line 87 "nsparser.y"
{
yyerrok;
}
break;
case 9:
#line 94 "../../freebsd/lib/libc/net/nsparser.y"
#line 94 "nsparser.y"
{
curdbt.name = yylval.str;
curdbt.srclist = NULL;
@@ -618,24 +615,24 @@ case 9:
}
break;
case 12:
#line 108 "../../freebsd/lib/libc/net/nsparser.y"
#line 108 "nsparser.y"
{
cursrc.flags = NS_TERMINATE;
_nsaddsrctomap(yystack.l_mark[0].str);
}
break;
case 13:
#line 112 "../../freebsd/lib/libc/net/nsparser.y"
#line 112 "nsparser.y"
{ cursrc.flags = NS_SUCCESS; }
break;
case 14:
#line 113 "../../freebsd/lib/libc/net/nsparser.y"
#line 113 "nsparser.y"
{
_nsaddsrctomap(yystack.l_mark[-4].str);
}
break;
case 17:
#line 125 "../../freebsd/lib/libc/net/nsparser.y"
#line 125 "nsparser.y"
{
if (yystack.l_mark[0].mapval) /* if action == RETURN set RETURN bit */
cursrc.flags |= yystack.l_mark[-2].mapval;
@@ -644,30 +641,30 @@ case 17:
}
break;
case 18:
#line 134 "../../freebsd/lib/libc/net/nsparser.y"
#line 134 "nsparser.y"
{ yyval.mapval = NS_SUCCESS; }
break;
case 19:
#line 135 "../../freebsd/lib/libc/net/nsparser.y"
#line 135 "nsparser.y"
{ yyval.mapval = NS_UNAVAIL; }
break;
case 20:
#line 136 "../../freebsd/lib/libc/net/nsparser.y"
#line 136 "nsparser.y"
{ yyval.mapval = NS_NOTFOUND; }
break;
case 21:
#line 137 "../../freebsd/lib/libc/net/nsparser.y"
#line 137 "nsparser.y"
{ yyval.mapval = NS_TRYAGAIN; }
break;
case 22:
#line 141 "../../freebsd/lib/libc/net/nsparser.y"
#line 141 "nsparser.y"
{ yyval.mapval = NS_ACTION_RETURN; }
break;
case 23:
#line 142 "../../freebsd/lib/libc/net/nsparser.y"
#line 142 "nsparser.y"
{ yyval.mapval = NS_ACTION_CONTINUE; }
break;
#line 671 "_nsyy.tab.c"
#line 668 "nsparser.c"
}
yystack.s_mark -= yym;
yystate = *yystack.s_mark;
@@ -685,11 +682,12 @@ break;
*++yystack.l_mark = yyval;
if (yychar < 0)
{
if ((yychar = YYLEX) < 0) yychar = YYEOF;
yychar = YYLEX;
if (yychar < 0) yychar = YYEOF;
#if YYDEBUG
if (yydebug)
{
yys = yyname[YYTRANSLATE(yychar)];
if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
printf("%sdebug: state %d, reading %d (%s)\n",
YYPREFIX, YYFINAL, yychar, yys);
}
@@ -698,8 +696,8 @@ break;
if (yychar == YYEOF) goto yyaccept;
goto yyloop;
}
if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
if (((yyn = yygindex[yym]) != 0) && (yyn += yystate) >= 0 &&
yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yystate)
yystate = yytable[yyn];
else
yystate = yydgoto[yym];
@@ -708,10 +706,7 @@ break;
printf("%sdebug: after reduction, shifting from state %d \
to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
#endif
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
{
goto yyoverflow;
}
if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
*++yystack.s_mark = (YYINT) yystate;
*++yystack.l_mark = yyval;
goto yyloop;