* src/bison.simple (yyparse): Let yyls1, yyss1 and yyvs1 be

defined only if yyoverflow is defined, to avoid `warning: unused
variable `yyvs1''.
Reported by The Test Suite.

diff --git a/ChangeLog b/ChangeLog
index 892cc343e32fa4e32ef97bd662be69251a61835d..b37a3a5af2a8e8b57b4543017fa09f2676c39683 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-14  Akim Demaille  <akim@epita.fr>
+
+       * src/bison.simple (yyparse): Let yyls1, yyss1 and yyvs1 be
+       defined only if yyoverflow is defined, to avoid `warning: unused
+       variable `yyvs1''.
+       Reported by The Test Suite.
+

 2001-11-14  Akim Demaille  <akim@epita.fr>
 
        * src/print.c: Include reduce.h.
 2001-11-14  Akim Demaille  <akim@epita.fr>
 
        * src/print.c: Include reduce.h.

diff --git a/src/bison.simple b/src/bison.simple
index d08be3ff7cfeb2a424b01470c9d16d85244c13b5..d5a6089be52d5257e17a6d8c5b784aaea5b477da 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -545,40 +545,38 @@ yyparse (YYPARSE_PARAM_ARG)
 
   if (yyssp >= yyss + yystacksize - 1)
     {
 
   if (yyssp >= yyss + yystacksize - 1)
     {

-      /* Give user a chance to reallocate the stack. Use copies of
-        these so that the &'s don't force the real ones into memory.
-        */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#if YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-

       /* Get the current used size of the three stacks, in elements.  */
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       /* Get the current used size of the three stacks, in elements.  */
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow

-      /* Each stack pointer address is followed by the size of the
-        data in use in that stack, in bytes.  */
+      {
+       /* Give user a chance to reallocate the stack. Use copies of
+          these so that the &'s don't force the real ones into
+          memory.  */
+       YYSTYPE *yyvs1 = yyvs;
+       short *yyss1 = yyss;
+
+       /* Each stack pointer address is followed by the size of the
+          data in use in that stack, in bytes.  */

 # if YYLSP_NEEDED
 # if YYLSP_NEEDED

-      /* This used to be a conditional around just the two extra args,
-        but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow ("parser stack overflow",
-                 &yyss1, size * sizeof (*yyssp),
-                 &yyvs1, size * sizeof (*yyvsp),
-                 &yyls1, size * sizeof (*yylsp),
-                 &yystacksize);
+       YYLTYPE *yyls1 = yyls;
+       /* This used to be a conditional around just the two extra args,
+          but that might be undefined if yyoverflow is a macro.  */
+       yyoverflow ("parser stack overflow",
+                   &yyss1, size * sizeof (*yyssp),
+                   &yyvs1, size * sizeof (*yyvsp),
+                   &yyls1, size * sizeof (*yylsp),
+                   &yystacksize);
+       yyls = yyls1;

 # else
 # else

-      yyoverflow ("parser stack overflow",
-                 &yyss1, size * sizeof (*yyssp),
-                 &yyvs1, size * sizeof (*yyvsp),
-                 &yystacksize);
-# endif
-
-      yyss = yyss1; yyvs = yyvs1;
-# if YYLSP_NEEDED
-      yyls = yyls1;
+       yyoverflow ("parser stack overflow",
+                   &yyss1, size * sizeof (*yyssp),
+                   &yyvs1, size * sizeof (*yyvsp),
+                   &yystacksize);

 # endif
 # endif

+       yyss = yyss1;
+       yyvs = yyvs1;
+      }

 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)