* tests/push.at (Push Parsing: Memory Leak for Early Deletion): Do not

name user variables starting with `yy'.  Just pass NULL instead of a
dummy local &yylval to yypush_parse.
* tests/torture.at (AT_DATA_STACK_TORTURE): Do not name user variables
starting with `yy'.

diff --git a/ChangeLog b/ChangeLog
index 6076bb5c1ec7309a4255f1106f5dae61015b0458..ffb7d5c093c1a0dd97de96937b39e1e680f3b92d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-11  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * tests/push.at (Push Parsing: Memory Leak for Early Deletion): Do not
+       name user variables starting with `yy'.  Just pass NULL instead of a
+       dummy local &yylval to yypush_parse.
+       * tests/torture.at (AT_DATA_STACK_TORTURE): Do not name user variables
+       starting with `yy'.
+
 2007-08-03  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/yacc.c (yyexhaustedlab): Define it when YYERROR_VERBOSE is

diff --git a/tests/push.at b/tests/push.at
index 62593d3e30076fb299db7df71303076fb9f1292c..4a9862904ae17209b845640ad74bcab98375125b 100644 (file)
--- a/tests/push.at
+++ b/tests/push.at
@@ -52,24 +52,22 @@ yyerror (char const *msg)
 int
 main (void)
 {
-  yypstate *yyps;
-  YYSTYPE yylval;
-
-  /* Make sure we don't try to free yyps->yyss in this case.  */
-  yyps = yypstate_new ();
-  yypstate_delete (yyps);
-
-  /* yypstate_delete used to leak yyps->yyss if the stack was reallocated but
-     the parse did not return on success, syntax error, or memory
-     exhaustion.  */
-  yyps = yypstate_new ();
-  assert (yypush_parse (yyps, 'a', &yylval) == YYPUSH_MORE);
-  yypstate_delete (yyps);
-
-  yyps = yypstate_new ();
-  assert (yypush_parse (yyps, 'a', &yylval) == YYPUSH_MORE);
-  assert (yypush_parse (yyps, 'b', &yylval) == YYPUSH_MORE);
-  yypstate_delete (yyps);
+  yypstate *ps;
+
+  /* Make sure we don't try to free ps->yyss in this case.  */
+  ps = yypstate_new ();
+  yypstate_delete (ps);
+
+  /* yypstate_delete used to leak ps->yyss if the stack was reallocated but the
+     parse did not return on success, syntax error, or memory exhaustion.  */
+  ps = yypstate_new ();
+  assert (yypush_parse (ps, 'a', NULL) == YYPUSH_MORE);
+  yypstate_delete (ps);
+
+  ps = yypstate_new ();
+  assert (yypush_parse (ps, 'a', NULL) == YYPUSH_MORE);
+  assert (yypush_parse (ps, 'b', NULL) == YYPUSH_MORE);
+  yypstate_delete (ps);
 
   return 0;
 }

diff --git a/tests/torture.at b/tests/torture.at
index 99a4245e7a1cf78c616ac5ddd79a682188a523c3..8874f1015db4f426eb548482e9eb84871915416f 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -444,13 +444,13 @@ main (int argc, const char **argv)
     int count;
     int status;
 ]m4_bmatch([$2], [%push-],
-[[    yypstate *yyps = yypstate_new ();
+[[    yypstate *ps = yypstate_new ();
 ]])[    for (count = 0; count < 2; ++count)
       {
         int new_status;
         yylval = yylval_init;
 ]m4_bmatch([$2], [%push-],
-[[        new_status = yypull_parse (yyps);
+[[        new_status = yypull_parse (ps);
 ]],
 [[        new_status = yyparse ();
 ]])[        if (count > 0 && new_status != status)
@@ -458,7 +458,7 @@ main (int argc, const char **argv)
         status = new_status;
       }
 ]m4_bmatch([$2], [%push-],
-[[    yypstate_delete (yyps);
+[[    yypstate_delete (ps);
 ]])[    return status;
   }
 }