* data/push.c (yypvarsinit): Change return type from void* to struct

yypvars*. No longer cast to void* on return.
(struct yypvars): Remove yylen since it need not be remembered between
yypushparse invocations.
(yypushparse): Don't copy between yylen and pv->yylen.

diff --git a/ChangeLog b/ChangeLog
index b47fd8d500d5207d2b8d21e4f0c63650ddaab051..017f66861f2eb3ddb768d5bc5b3061b6983b0bd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-07  Bob Rossi  <bob@brasko.net>
+       and Joel Denny  <jdenny@ces.clemson.edu>
+
+       * data/push.c (yypvarsinit): Change return type from void* to struct
+       yypvars*. No longer cast to void* on return.
+       (struct yypvars): Remove yylen since it need not be remembered between
+       yypushparse invocations.
+       (yypushparse): Don't copy between yylen and pv->yylen.
+
 2006-12-05  Bob Rossi  <bob@brasko.net>
 
        * data/push.c (yychar_set, yylval_set, yylloc_set): Delete.

diff --git a/data/push.c b/data/push.c
index d8c98150b5f488ca9749e8ad1c6f7f8d6ac41940..2e6165b58580b77d4a25f3d054bc33a6b911bb73 100644 (file)
--- a/data/push.c
+++ b/data/push.c
@@ -970,7 +970,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar)
 ]b4_push_if([
 struct yypvars;
 enum { YYPUSH_MORE = 4 };
-]b4_c_function_decl([yypvarsinit], [void *], [[void], []])[
+]b4_c_function_decl([yypvarsinit], [struct yypvars *], [[void], []])[
 ]b4_c_function_decl([yypushparse], [int],
    [[struct yypvars *yypvars], [yypvars]],
    [[int yynchar], [yynchar]],
@@ -1038,7 +1038,6 @@ m4_define([b4_declare_yyparse_variables],
     /* The locations where the error started and ended.  */
     YYLTYPE yyerror_range[2];]]])[
     YYSIZE_T yystacksize;
-    int yylen;
     /* The variables used to return semantic value and location from the
        action routines.  */
     YYSTYPE yyval;
@@ -1048,7 +1047,7 @@ m4_define([b4_declare_yyparse_variables],
   };
 
 /* Initialize the parser data structure.  */
-void *
+struct yypvars*
 yypvarsinit (void)
 {
   struct yypvars *pv = (struct yypvars *) malloc (sizeof *pv);
@@ -1071,7 +1070,7 @@ yypvarsinit (void)
 
 ]b4_locations_if([  pv->yylsp = pv->yyls;])[
 
-  return (void *) pv;
+  return pv;
 }])
 m4_divert_pop([KILL])dnl# ====================== End of M4 code.
 
@@ -1208,7 +1207,6 @@ m4_ifdef([b4_at_dollar_used], [[  yylsp[0] = yylloc;
        yylsp = pv->yylsp;]])[
 
        yystacksize = pv->yystacksize;
-       yylen = pv->yylen;
        yyval = pv->yyval;
        ]b4_locations_if([yyloc = pv->yyloc;])[
       if (pv->yynew == 0)
@@ -1339,7 +1337,6 @@ yybackup:
        pv->yylsp = yylsp;]])[
 
        pv->yystacksize = yystacksize;
-       pv->yylen = yylen;
        pv->yyval = yyval;
        ]b4_locations_if([pv->yyloc = yyloc;])[
        goto yypushreturn;