diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-12-13 22:16:02 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-12-13 22:16:02 +0000 |
commit | 2aca18c7aefb39b8086edf623892ac09f96c902f (patch) | |
tree | c9f9902e6fee53e25ac317fe52b5ee31558e65bb /contrib/byacc/btyaccpar.c | |
parent | 442f3ba311a4f01835953feb59ae1ea41c44fdf8 (diff) | |
parent | af7e34d5cb7547f2c377442a096254dbda0d6809 (diff) | |
download | src-2aca18c7aefb39b8086edf623892ac09f96c902f.tar.gz src-2aca18c7aefb39b8086edf623892ac09f96c902f.zip |
MFV: r309561
Merge byacc 20161202.
Notes
Notes:
svn path=/head/; revision=310036
Diffstat (limited to 'contrib/byacc/btyaccpar.c')
-rw-r--r-- | contrib/byacc/btyaccpar.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/contrib/byacc/btyaccpar.c b/contrib/byacc/btyaccpar.c index 42070193d969..f8ef414a8e30 100644 --- a/contrib/byacc/btyaccpar.c +++ b/contrib/byacc/btyaccpar.c @@ -1,8 +1,8 @@ /* This file generated automatically using - * @Id: skel2c,v 1.3 2014/04/06 19:48:04 tom Exp @ + * @Id: skel2c,v 1.4 2016/06/07 00:26:09 tom Exp @ */ -/* @Id: btyaccpar.skel,v 1.3 2016/06/06 23:35:55 Tom.Shields Exp @ */ +/* @Id: btyaccpar.skel,v 1.5 2016/12/02 22:02:28 tom Exp @ */ #include "defs.h" @@ -218,9 +218,9 @@ const char *const hdr_vars[] = "#endif", "", "/* Current position at lexical token queue */", - "static short *yylexp = 0;", + "static YYINT *yylexp = 0;", "", - "static short *yylexemes = 0;", + "static YYINT *yylexemes = 0;", "#endif /* YYBTYACC */", #endif /* defined(YYBTYACC) */ 0 @@ -275,9 +275,9 @@ const char *const body_vars[] = "#endif", "", " /* Current position at lexical token queue */", - " static short *yylexp = 0;", + " static YYINT *yylexp = 0;", "", - " static short *yylexemes = 0;", + " static YYINT *yylexemes = 0;", "#endif /* YYBTYACC */", #endif /* defined(YYBTYACC) */ 0 @@ -451,6 +451,11 @@ const char *const body_2[] = " fprintf(stderr, \"%sdebug[<# of symbols on state stack>]\\n\", YYPREFIX);", "#endif", "", + 0 +}; + +const char *const body_3[] = +{ #if defined(YYBTYACC) "#if YYBTYACC", " yyps = yyNewState(0); if (yyps == 0) goto yyenomem;", @@ -503,10 +508,10 @@ const char *const body_2[] = " size_t s = (size_t) (yylvlim - yylvals);", "", " s += YYLVQUEUEGROWTH;", - " if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;", - " if ((yylvals = (YYSTYPE *) realloc(yylvals, s * sizeof(YYSTYPE))) == NULL) goto yyenomem;", + " if ((yylexemes = realloc(yylexemes, s * sizeof(YYINT))) == NULL) goto yyenomem;", + " if ((yylvals = realloc(yylvals, s * sizeof(YYSTYPE))) == NULL) goto yyenomem;", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", - " if ((yylpsns = (YYLTYPE *) realloc(yylpsns, s * sizeof(YYLTYPE))) == NULL) goto yyenomem;", + " if ((yylpsns = realloc(yylpsns, s * sizeof(YYLTYPE))) == NULL) goto yyenomem;", "#endif", " yylvp = yylve = yylvals + p;", " yylvlim = yylvals + s;", @@ -516,7 +521,7 @@ const char *const body_2[] = "#endif", " yylexp = yylexemes + p;", " }", - " *yylexp = (short) YYLEX;", + " *yylexp = (YYINT) YYLEX;", " *yylvp++ = yylval;", " yylve++;", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", @@ -623,7 +628,7 @@ const char *const body_2[] = " /* If this is a first conflict in the stack, start saving lexemes */", " if (!yylexemes)", " {", - " yylexemes = (short *) malloc((YYLVQUEUEGROWTH) * sizeof(short));", + " yylexemes = malloc((YYLVQUEUEGROWTH) * sizeof(YYINT));", " if (yylexemes == NULL) goto yyenomem;", " yylvals = (YYSTYPE *) malloc((YYLVQUEUEGROWTH) * sizeof(YYSTYPE));", " if (yylvals == NULL) goto yyenomem;", @@ -647,7 +652,7 @@ const char *const body_2[] = "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", " *yylpe++ = yylloc;", "#endif", - " *yylexp = (short) yychar;", + " *yylexp = (YYINT) yychar;", " yychar = YYEMPTY;", " }", " }", @@ -1046,12 +1051,12 @@ const char *const trailer[] = " size_t s = (size_t) (yylvlim - yylvals);", "", " s += YYLVQUEUEGROWTH;", - " if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL)", + " if ((yylexemes = realloc(yylexemes, s * sizeof(YYINT))) == NULL)", " goto yyenomem;", - " if ((yylvals = (YYSTYPE *) realloc(yylvals, s * sizeof(YYSTYPE))) == NULL)", + " if ((yylvals = realloc(yylvals, s * sizeof(YYSTYPE))) == NULL)", " goto yyenomem;", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", - " if ((yylpsns = (YYLTYPE *) realloc(yylpsns, s * sizeof(YYLTYPE))) == NULL)", + " if ((yylpsns = realloc(yylpsns, s * sizeof(YYLTYPE))) == NULL)", " goto yyenomem;", "#endif", " yylvp = yylve = yylvals + p;", @@ -1062,7 +1067,7 @@ const char *const trailer[] = "#endif", " yylexp = yylexemes + p;", " }", - " *yylexp = (short) YYLEX;", + " *yylexp = (YYINT) YYLEX;", " *yylvp++ = yylval;", " yylve++;", "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)", |