From ee5abb379bc118339852b742fea1ca1c8fce7706 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Fri, 15 Dec 2006 05:31:26 +0000 Subject: [PATCH] * data/push.c (yypstate): Add typedef, and update all uses of struct yypstate to just yypstate. * tests/calc.at (_AT_DATA_CALC_Y): Update here as well. --- ChangeLog | 7 +++++++ data/push.c | 22 ++++++++++++---------- tests/calc.at | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc3a5b00..dd66b0cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-15 Bob Rossi + and Joel Denny + + * data/push.c (yypstate): Add typedef, and update all uses of + struct yypstate to just yypstate. + * tests/calc.at (_AT_DATA_CALC_Y): Update here as well. + 2006-12-14 Bob Rossi * data/push.c (yypush_parse): Declare prototype regardless of diff --git a/data/push.c b/data/push.c index 07069a4f..b7eededf 100644 --- a/data/push.c +++ b/data/push.c @@ -963,11 +963,12 @@ yysyntax_error (char *yyresult, int yystate, int yychar) ]b4_push_if([ struct yypstate; +typedef struct yypstate yypstate; enum { YYPUSH_MORE = 4 }; -]b4_c_function_decl([yypstate_new], [struct yypstate *], [[void], []])[ -]b4_c_function_decl([yypstate_delete], [void], [[struct yypstate *yyps], [yyps]])[ +]b4_c_function_decl([yypstate_new], [yypstate *], [[void], []])[ +]b4_c_function_decl([yypstate_delete], [void], [[yypstate *yyps], [yyps]])[ ]b4_c_function_decl([yypush_parse], [int], - [[struct yypstate *yyps], [yyps]], + [[yypstate *yyps], [yyps]], [[int yynchar], [yynchar]], [[YYSTYPE const *yynlval], [yynlval]] b4_locations_if([,[[YYLTYPE const *yynlloc], [yynlloc]]]))[ @@ -1047,9 +1048,9 @@ m4_define([b4_declare_yyparse_variables], }; /* Initialize the parser data structure. */ -]b4_c_function_def([yypstate_new], [struct yypstate *])[ +]b4_c_function_def([yypstate_new], [yypstate *])[ { - struct yypstate *yyps = (struct yypstate *) malloc (sizeof *yyps); + yypstate *yyps = (yypstate *) malloc (sizeof *yyps); yyps->yystate = 0; yyps->yyresult = -1; yyps->yyerrstatus = 0; @@ -1073,7 +1074,7 @@ m4_define([b4_declare_yyparse_variables], } ]b4_c_function_def([yypstate_delete], [void], - [[struct yypstate *yyps], [yyps]])[ + [[yypstate *yyps], [yyps]])[ { free (yyps); } @@ -1090,7 +1091,7 @@ b4_push_if([b4_declare_yyparse_variables]) `-------------------------*/ b4_push_if([ -b4_c_function_def([yypush_parse], [int], [[struct yypstate *yyps], [yyps]], +b4_c_function_def([yypush_parse], [int], [[yypstate *yyps], [yyps]], [[int yynchar], [yynchar]], [[YYSTYPE const *yynlval], [yynlval]] b4_locations_if([,[[YYLTYPE const *yynlloc], [yynlloc]]]))],[ @@ -1690,12 +1691,13 @@ typedef struct YYLTYPE )dnl b4_locations_if ]b4_push_if([struct ]b4_prefix[pstate; -]b4_c_function_decl([]b4_prefix[pstate_new], [struct ]b4_prefix[pstate *], +typedef struct ]b4_prefix[pstate ]b4_prefix[pstate; +]b4_c_function_decl([]b4_prefix[pstate_new], []b4_prefix[pstate *], [[void], []])[ ]b4_c_function_decl([]b4_prefix[pstate_delete], [void], - [[struct ]b4_prefix[pstate *yyps],[yyps]])[ + [[]b4_prefix[pstate *yyps],[yyps]])[ ]b4_c_function_decl([]b4_prefix[push_parse], [int], - [[struct ]b4_prefix[pstate *]b4_prefix[pstate], []b4_prefix[pstate]], + [[]b4_prefix[pstate *]b4_prefix[pstate], []b4_prefix[pstate]], [[int yynchar], [yynchar]], [[YYSTYPE const *yynlval], [yynlval]] b4_locations_if([,[[YYLTYPE const *yynlloc], [yynlloc]]]))[ diff --git a/tests/calc.at b/tests/calc.at index d245dd18..4e67f035 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -338,7 +338,7 @@ main (int argc, const char **argv) [ yydebug = 1;])])[ ]AT_PUSH_IF([ { - struct yypstate *pstate = yypstate_new (); + yypstate *pstate = yypstate_new (); YYSTYPE my_lval; ]AT_LOCATION_IF([YYLTYPE my_lloc;])[ do { -- 2.45.2