Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/byacc/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/928fa39ec3a2
branches: trunk
changeset: 821645:928fa39ec3a2
user: christos <christos%NetBSD.org@localhost>
date: Sat Feb 11 19:33:12 2017 +0000
description:
merge conflicts
diffstat:
external/bsd/byacc/dist/btyaccpar.c | 100 +-
external/bsd/byacc/dist/btyaccpar.skel | 76 +-
external/bsd/byacc/dist/defs.h | 27 +-
external/bsd/byacc/dist/error.c | 13 +-
external/bsd/byacc/dist/lalr.c | 34 +-
external/bsd/byacc/dist/lr0.c | 20 +-
external/bsd/byacc/dist/main.c | 65 +-
external/bsd/byacc/dist/mkpar.c | 14 +-
external/bsd/byacc/dist/mstring.c | 20 +-
external/bsd/byacc/dist/output.c | 131 ++-
external/bsd/byacc/dist/reader.c | 466 ++++++++++---
external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h | 2 +-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/calc.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/calc1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/calc2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/calc3.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/code_calc.code.c | 2 +-
external/bsd/byacc/dist/test/btyacc/code_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/code_calc.tab.h | 2 +-
external/bsd/byacc/dist/test/btyacc/code_error.code.c | 2 +-
external/bsd/byacc/dist/test/btyacc/code_error.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/empty.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h | 2 +-
external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax13.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/error.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.h | 2 +-
external/bsd/byacc/dist/test/btyacc/grammar.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/inherit0.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/inherit1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/inherit2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/pure_error.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c | 2 +-
external/bsd/byacc/dist/test/btyacc/rename_debug.c | 2 +-
external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c | 2 +-
external/bsd/byacc/dist/test/code_calc.y | 2 +-
external/bsd/byacc/dist/test/err_inherit4.y | 2 +-
external/bsd/byacc/dist/test/expr.oxout.y | 2 +-
external/bsd/byacc/dist/test/yacc/calc.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/calc1.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/calc2.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/calc3.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/code_calc.code.c | 2 +-
external/bsd/byacc/dist/test/yacc/code_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/code_calc.tab.h | 2 +-
external/bsd/byacc/dist/test/yacc/code_error.code.c | 2 +-
external/bsd/byacc/dist/test/yacc/empty.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/error.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/expr.oxout.tab.h | 2 +-
external/bsd/byacc/dist/test/yacc/grammar.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/pure_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/pure_error.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c | 2 +-
external/bsd/byacc/dist/test/yacc/rename_debug.c | 2 +-
external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c | 2 +-
external/bsd/byacc/dist/verbose.c | 8 +-
external/bsd/byacc/dist/yaccpar.c | 67 +-
119 files changed, 781 insertions(+), 472 deletions(-)
diffs (truncated from 3446 to 300 lines):
diff -r f01656a009ce -r 928fa39ec3a2 external/bsd/byacc/dist/btyaccpar.c
--- a/external/bsd/byacc/dist/btyaccpar.c Sat Feb 11 19:32:41 2017 +0000
+++ b/external/bsd/byacc/dist/btyaccpar.c Sat Feb 11 19:33:12 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: btyaccpar.c,v 1.2 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: btyaccpar.c,v 1.3 2017/02/11 19:33:12 christos Exp $ */
/* 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.1 2014/04/02 22:44:41 tom Exp @ */
+/* @Id: btyaccpar.skel,v 1.5 2016/12/02 22:02:28 tom Exp @ */
#include "defs.h"
@@ -20,7 +20,7 @@
{
"/* original parser id follows */",
"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
- "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */",
+ "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
@@ -68,8 +68,10 @@
"#endif /* YYBTYACC */",
#endif /* defined(YYBTYACC) */
"",
+ "#if YYDEBUG || defined(yytname)",
+ "extern const char *const yyname[];",
+ "#endif",
"#if YYDEBUG",
- "extern const char *const yyname[];",
"extern const char *const yyrule[];",
"#endif",
0
@@ -150,9 +152,9 @@
"",
"typedef struct {",
" unsigned stacksize;",
- " short *s_base;",
- " short *s_mark;",
- " short *s_last;",
+ " YYINT *s_base;",
+ " YYINT *s_mark;",
+ " YYINT *s_last;",
" YYSTYPE *l_base;",
" YYSTYPE *l_mark;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -218,9 +220,9 @@
"#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 +277,9 @@
"#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
@@ -295,18 +297,18 @@
#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
- "#include <stdio.h> /* needed for printf */",
+ "#include <stdio.h> /* needed for printf */",
"#endif",
"",
- "#include <stdlib.h> /* needed for malloc, etc */",
- "#include <string.h> /* needed for memset */",
+ "#include <stdlib.h> /* needed for malloc, etc */",
+ "#include <string.h> /* needed for memset */",
"",
"/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
"static int yygrowstack(YYSTACKDATA *data)",
"{",
" int i;",
" unsigned newsize;",
- " short *newss;",
+ " YYINT *newss;",
" YYSTYPE *newvs;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYLTYPE *newps;",
@@ -320,7 +322,7 @@
" newsize = YYMAXDEPTH;",
"",
" i = (int) (data->s_mark - data->s_base);",
- " newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));",
+ " newss = (YYINT *)realloc(data->s_base, newsize * sizeof(*newss));",
" if (newss == 0)",
" return YYENOMEM;",
"",
@@ -385,7 +387,7 @@
"#endif",
" return p;",
" }",
- " p->yystack.s_base = (short *) malloc(size * sizeof(short));",
+ " p->yystack.s_base = (YYINT *) malloc(size * sizeof(YYINT));",
" if (p->yystack.s_base == NULL) return NULL;",
" p->yystack.l_base = (YYSTYPE *) malloc(size * sizeof(YYSTYPE));",
" if (p->yystack.l_base == NULL) return NULL;",
@@ -454,13 +456,16 @@
0
};
-const char *const body_3[] = {
+const char *const body_3[] =
+{
#if defined(YYBTYACC)
"#if YYBTYACC",
" yyps = yyNewState(0); if (yyps == 0) goto yyenomem;",
" yyps->save = 0;",
"#endif /* YYBTYACC */",
#endif /* defined(YYBTYACC) */
+ " yym = 0;",
+ " yyn = 0;",
" yynerrs = 0;",
" yyerrflag = 0;",
" yychar = YYEMPTY;",
@@ -505,10 +510,10 @@
" 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;",
@@ -518,7 +523,7 @@
"#endif",
" yylexp = yylexemes + p;",
" }",
- " *yylexp = (short) YYLEX;",
+ " *yylexp = (YYINT) YYLEX;",
" *yylvp++ = yylval;",
" yylve++;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -538,11 +543,10 @@
"#endif /* YYBTYACC */",
#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
- " /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
" if (yydebug)",
" {",
- " yys = yyname[YYTRANSLATE(yychar)];",
+ " if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];",
" fprintf(stderr, \"%s[%d]: state %d, reading token %d (%s)\",",
" YYDEBUGSTR, yydepth, yystate, yychar, yys);",
"#ifdef YYSTYPE_TOSTRING",
@@ -604,7 +608,7 @@
" save->state = yystate;",
" save->errflag = yyerrflag;",
" save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
" save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base);",
" memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -626,7 +630,7 @@
" /* 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;",
@@ -650,7 +654,7 @@
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" *yylpe++ = yylloc;",
"#endif",
- " *yylexp = (short) yychar;",
+ " *yylexp = (YYINT) yychar;",
" yychar = YYEMPTY;",
" }",
" }",
@@ -685,7 +689,7 @@
" if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)",
" goto yyoverflow;",
" yystate = yyctable[ctry];",
- " *++yystack.s_mark = (short) yystate;",
+ " *++yystack.s_mark = (YYINT) yystate;",
" *++yystack.l_mark = yylval;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" *++yystack.p_mark = yylloc;",
@@ -733,9 +737,18 @@
"",
" yynewerrflag = 1;",
" goto yyerrhandler;",
- " goto yyerrlab;",
+ " goto yyerrlab; /* redundant goto avoids 'unused label' warning */",
"",
"yyerrlab:",
+ " /* explicit YYERROR from an action -- pop the rhs of the rule reduced",
+ " * before looking for error recovery */",
+ " yystack.s_mark -= yym;",
+ " yystate = *yystack.s_mark;",
+ " yystack.l_mark -= yym;",
+ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
+ " yystack.p_mark -= yym;",
+ "#endif",
+ "",
" yynewerrflag = 0;",
"yyerrhandler:",
" while (yyps->save)",
@@ -760,7 +773,7 @@
" yyerrctx->state = yystate;",
" yyerrctx->errflag = yyerrflag;",
" yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
" yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);",
" memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -776,7 +789,7 @@
" yylexp = yylexemes + save->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);",
- " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
" yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);",
" memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -811,7 +824,7 @@
" yylloc = yylpp[-1];",
"#endif",
" yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);",
- " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(YYINT));",
" yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);",
" memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -834,7 +847,7 @@
"#endif",
"",
"#if !YYBTYACC",
- " goto yyerrlab;",
+ " goto yyerrlab; /* redundant goto avoids 'unused label' warning */",
"yyerrlab:",
"#endif",
" ++yynerrs;",
@@ -905,7 +918,7 @@
"#if YYDEBUG",
" if (yydebug)",
" {",
- " yys = yyname[YYTRANSLATE(yychar)];",
+ " if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];",
" fprintf(stderr, \"%s[%d]: state %d, error recovery discarding token %d (%s)\\n\",",
" YYDEBUGSTR, yydepth, yystate, yychar, yys);",
" }",
@@ -1040,12 +1053,12 @@
" 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;",
@@ -1056,7 +1069,7 @@
"#endif",
" yylexp = yylexemes + p;",
" }",
- " *yylexp = (short) YYLEX;",
+ " *yylexp = (YYINT) YYLEX;",
" *yylvp++ = yylval;",
" yylve++;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -1076,12 +1089,11 @@
"#endif /* YYBTYACC */",
#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
Home |
Main Index |
Thread Index |
Old Index