This commit is contained in:
Akim Demaille
2019-10-06 17:48:51 +02:00
parent d2a7a28438
commit 58302c6079
2 changed files with 16 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.4.2.115-5e16-dirty. */ /* A Bison parser, made by GNU Bison 3.4.2.139-1283. */
/* Bison implementation for Yacc-like parsers in C /* Bison implementation for Yacc-like parsers in C
@@ -48,7 +48,7 @@
#define YYBISON 1 #define YYBISON 1
/* Bison version. */ /* Bison version. */
#define YYBISON_VERSION "3.4.2.115-5e16-dirty" #define YYBISON_VERSION "3.4.2.139-1283"
/* Skeleton name. */ /* Skeleton name. */
#define YYSKELETON_NAME "yacc.c" #define YYSKELETON_NAME "yacc.c"
@@ -239,7 +239,7 @@ typedef short yytype_int16;
# elif defined ptrdiff_t && defined PTRDIFF_MAX # elif defined ptrdiff_t && defined PTRDIFF_MAX
# define YYPTRDIFF_T ptrdiff_t # define YYPTRDIFF_T ptrdiff_t
# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX # define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
# elif 199901 <= __STDC_VERSION__ # elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYPTRDIFF_T ptrdiff_t # define YYPTRDIFF_T ptrdiff_t
# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ # include <stdint.h> /* INFRINGES ON USER NAME SPACE */
@@ -256,7 +256,7 @@ typedef short yytype_int16;
# define YYSIZE_T __SIZE_TYPE__ # define YYSIZE_T __SIZE_TYPE__
# elif defined size_t # elif defined size_t
# define YYSIZE_T size_t # define YYSIZE_T size_t
# elif 199901 <= __STDC_VERSION__ # elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t # define YYSIZE_T size_t
# else # else
@@ -331,18 +331,6 @@ typedef yytype_uint8 yy_state_num;
#endif #endif
/* Suppress bogus -Wconversion warnings from GCC. */
#if 4 < __GNUC__ + (7 <= __GNUC_MINOR__)
# define YY_CONVERT_INT_BEGIN \
_Pragma ("GCC diagnostic push") \
_Pragma ("GCC diagnostic ignored \"-Wconversion\"")
# define YY_CONVERT_INT_END \
_Pragma ("GCC diagnostic pop")
#else
# define YY_CONVERT_INT_BEGIN
# define YY_CONVERT_INT_END
#endif
#define YY_ASSERT(E) ((void) (0 && (E))) #define YY_ASSERT(E) ((void) (0 && (E)))
#if 1 #if 1
@@ -1194,7 +1182,8 @@ yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd,
yy_state_num *yybottom_no_free, yy_state_num *yybottom_no_free,
yy_state_num **yytop, yy_state_num *yytop_empty) yy_state_num **yytop, yy_state_num *yytop_empty)
{ {
YYPTRDIFF_T yysize_old = *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1; YYPTRDIFF_T yysize_old =
*yytop == yytop_empty ? 0 : (YYPTRDIFF_T) (*yytop - *yybottom + 1);
YYPTRDIFF_T yysize_new = yysize_old + yyadd; YYPTRDIFF_T yysize_new = yysize_old + yyadd;
if (*yycapacity < yysize_new) if (*yycapacity < yysize_new)
{ {
@@ -1358,7 +1347,7 @@ yy_lac (yy_state_num *yyesa, yy_state_num **yyes,
YYDPRINTF ((stderr, " R%d", yyrule - 1)); YYDPRINTF ((stderr, " R%d", yyrule - 1));
if (yyesp != yyes_prev) if (yyesp != yyes_prev)
{ {
YYPTRDIFF_T yysize = yyesp - *yyes + 1; YYPTRDIFF_T yysize = (YYPTRDIFF_T) (yyesp - *yyes + 1);
if (yylen < yysize) if (yylen < yysize)
{ {
yyesp -= yylen; yyesp -= yylen;
@@ -1385,9 +1374,7 @@ yy_lac (yy_state_num *yyesa, yy_state_num **yyes,
if (yyesp == yyes_prev) if (yyesp == yyes_prev)
{ {
yyesp = *yyes; yyesp = *yyes;
YY_CONVERT_INT_BEGIN *yyesp = (yy_state_num) yystate;
*yyesp = yystate;
YY_CONVERT_INT_END
} }
else else
{ {
@@ -1400,9 +1387,7 @@ yy_lac (yy_state_num *yyesa, yy_state_num **yyes,
YYDPRINTF ((stderr, "\n")); YYDPRINTF ((stderr, "\n"));
return 2; return 2;
} }
YY_CONVERT_INT_BEGIN *++yyesp = (yy_state_num) yystate;
*++yyesp = yystate;
YY_CONVERT_INT_END
} }
YYDPRINTF ((stderr, " G%d", yystate)); YYDPRINTF ((stderr, " G%d", yystate));
} }
@@ -1492,10 +1477,10 @@ yytnamerr (char *yyres, const char *yystr)
do_not_strip_quotes: ; do_not_strip_quotes: ;
} }
if (! yyres) if (yyres)
return (YYPTRDIFF_T) (yystpcpy (yyres, yystr) - yyres);
else
return yystrlen (yystr); return yystrlen (yystr);
return yystpcpy (yyres, yystr) - yyres;
} }
# endif # endif
@@ -1797,7 +1782,7 @@ YYLTYPE yylloc = yyloc_default;
yystacksize = YYINITDEPTH; yystacksize = YYINITDEPTH;
yyes = yyesa; yyes = yyesa;
yyes_capacity = sizeof yyesa / sizeof *yyes; yyes_capacity = (YYPTRDIFF_T) (sizeof yyesa / sizeof *yyes);
if (YYMAXDEPTH < yyes_capacity) if (YYMAXDEPTH < yyes_capacity)
yyes_capacity = YYMAXDEPTH; yyes_capacity = YYMAXDEPTH;
@@ -1836,9 +1821,7 @@ yynewstate:
yysetstate: yysetstate:
YYDPRINTF ((stderr, "Entering state %d\n", yystate)); YYDPRINTF ((stderr, "Entering state %d\n", yystate));
YY_ASSERT (0 <= yystate && yystate < YYNSTATES); YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
YY_CONVERT_INT_BEGIN *yyssp = (yy_state_num) yystate;
*yyssp = yystate;
YY_CONVERT_INT_END
if (yyss + yystacksize - 1 <= yyssp) if (yyss + yystacksize - 1 <= yyssp)
#if !defined yyoverflow && !defined YYSTACK_RELOCATE #if !defined yyoverflow && !defined YYSTACK_RELOCATE
@@ -1846,7 +1829,7 @@ yysetstate:
#else #else
{ {
/* Get the current used size of the three stacks, in elements. */ /* Get the current used size of the three stacks, in elements. */
YYPTRDIFF_T yysize = yyssp - yyss + 1; YYPTRDIFF_T yysize = (YYPTRDIFF_T) (yyssp - yyss + 1);
# if defined yyoverflow # if defined yyoverflow
{ {

View File

@@ -1,4 +1,4 @@
/* A Bison parser, made by GNU Bison 3.4.2.115-5e16-dirty. */ /* A Bison parser, made by GNU Bison 3.4.2.139-1283. */
/* Bison interface for Yacc-like parsers in C /* Bison interface for Yacc-like parsers in C