From 716c50b877ef2a3f95d98ba07239af553955ec56 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 4 Dec 2001 14:06:06 +0000 Subject: [PATCH] * src/bison.simple (union yyalloc): Change member names to be the same as the stack names. (YYPOINTER): Remove. (yyparse): yyptr is now union yyalloc *, not char *. (YYSTACK_RELOCATE): Likewise. This avoids a GCC warning, and may generate better code on some machines. --- src/bison.simple | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/bison.simple b/src/bison.simple index 52b2d1ce..e6763602 100644 --- a/src/bison.simple +++ b/src/bison.simple @@ -80,10 +80,10 @@ /* A type that is properly aligned for any stack member. */ union yyalloc { - short yys; - YYSTYPE yyv; + short yyss; + YYSTYPE yyvs; # if YYLSP_NEEDED - YYLTYPE yyl; + YYLTYPE yyls; # endif }; @@ -102,12 +102,6 @@ union yyalloc + YYSTACK_GAP_MAX) # endif -# if defined (__STDC__) || defined (__cplusplus) -# define YYPOINTER void * -# else -# define YYPOINTER char * -# endif - /* Relocate the TYPE STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the @@ -117,12 +111,11 @@ union yyalloc do \ { \ YYSIZE_T yynewbytes; \ - yymemcpy (yyptr, (char *) (Stack), \ + yymemcpy ((char *) yyptr, (char *) (Stack), \ yysize * (YYSIZE_T) sizeof (Type)); \ - (Stack) = (Type *) (YYPOINTER) yyptr; \ + Stack = &yyptr->Stack; \ yynewbytes = yystacksize * sizeof (Type) + YYSTACK_GAP_MAX; \ - yynewbytes -= yynewbytes % sizeof (union yyalloc); \ - yyptr += yynewbytes; \ + yyptr += yynewbytes / sizeof (*yyptr); \ } \ while (0) @@ -525,7 +518,8 @@ yyparse (YYPARSE_PARAM_ARG) { short *yyss1 = yyss; - char *yyptr = (char *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) goto yyoverflowlab; YYSTACK_RELOCATE (short, yyss);