Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

skeletons: simplify after knr removal

Browse Source 
* data/c.m4 (b4_yydestruct_generate, b4_yy_symbol_print_generate):
They no longer need an argument, it has a single possible value.
* data/glr.c, data/yacc.c: Adjust.
This commit is contained in:
Akim Demaille
2012-08-02 14:11:07 +02:00
parent 15f6666958
commit d00ff612f8
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/c.m4
View File

@@ -407,17 +407,16 @@ b4_syncline([@oline@], [@ofile@])
break;]) break;])
# b4_yydestruct_generate(FUNCTION-DECLARATOR) # b4_yydestruct_generate
# ------------------------------------------- # ----------------------
# Generate the "yydestruct" function, which declaration is issued using # Define the "yydestruct" function.
# FUNCTION-DECLARATOR, which may be "b4_function_define".
m4_define_default([b4_yydestruct_generate], m4_define_default([b4_yydestruct_generate],
[[/*-----------------------------------------------. [[/*-----------------------------------------------.
| Release the memory associated to this symbol. | | Release the memory associated to this symbol. |
`-----------------------------------------------*/ `-----------------------------------------------*/
/*ARGSUSED*/ /*ARGSUSED*/
]$1([yydestruct], ]b4_function_define([yydestruct],
[static void], [static void],
[[const char *yymsg], [yymsg]], [[const char *yymsg], [yymsg]],
[[int yytype], [yytype]], [[int yytype], [yytype]],
@@ -440,10 +439,9 @@ m4_ifset([b4_parse_param], [, b4_parse_param]))[
]) ])
# b4_yy_symbol_print_generate(FUNCTION-DECLARATOR) # b4_yy_symbol_print_generate
# ------------------------------------------------ # ---------------------------
# Generate the "yy_symbol_print" function, which declaration is issued using # Define the "yy_symbol_print" function.
# FUNCTION-DECLARATOR, which may be "b4_function_define".
m4_define_default([b4_yy_symbol_print_generate], m4_define_default([b4_yy_symbol_print_generate],
[[ [[
/*--------------------------------. /*--------------------------------.
@@ -451,7 +449,7 @@ m4_define_default([b4_yy_symbol_print_generate],
`--------------------------------*/ `--------------------------------*/
/*ARGSUSED*/ /*ARGSUSED*/
]$1([yy_symbol_value_print], ]b4_function_define([yy_symbol_value_print],
[static void], [static void],
[[FILE *yyoutput], [yyoutput]], [[FILE *yyoutput], [yyoutput]],
[[int yytype], [yytype]], [[int yytype], [yytype]],
@@ -483,7 +481,7 @@ m4_if(b4_skeleton, ["yacc.c"],
| Print this symbol on YYOUTPUT. | | Print this symbol on YYOUTPUT. |
`--------------------------------*/ `--------------------------------*/
]$1([yy_symbol_print], ]b4_function_define([yy_symbol_print],
[static void], [static void],
[[FILE *yyoutput], [yyoutput]], [[FILE *yyoutput], [yyoutput]],
[[int yytype], [yytype]], [[int yytype], [yytype]],

4
data/glr.c
View File

@@ -491,7 +491,7 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG;
YYFPRINTF Args; \ YYFPRINTF Args; \
} while (YYID (0)) } while (YYID (0))
]b4_yy_symbol_print_generate([b4_function_define])[ ]b4_yy_symbol_print_generate[
# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
do { \ do { \
@@ -872,7 +872,7 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1)
/* Bison grammar-table manipulation. */ /* Bison grammar-table manipulation. */
]b4_yydestruct_generate([b4_function_define])[ ]b4_yydestruct_generate[
/** Number of symbols composing the right hand side of rule #RULE. */ /** Number of symbols composing the right hand side of rule #RULE. */
static inline int static inline int

4
data/yacc.c
View File

@@ -714,7 +714,7 @@ do { \
} \ } \
} while (YYID (0)) } while (YYID (0))
]b4_yy_symbol_print_generate([b4_function_define])[ ]b4_yy_symbol_print_generate[
/*------------------------------------------------------------------. /*------------------------------------------------------------------.
| yy_stack_print -- Print the state stack from its BOTTOM up to its | | yy_stack_print -- Print the state stack from its BOTTOM up to its |
@@ -1284,7 +1284,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
} }
#endif /* YYERROR_VERBOSE */ #endif /* YYERROR_VERBOSE */
]b4_yydestruct_generate([b4_function_define])[ ]b4_yydestruct_generate[
]b4_pure_if([], [ ]b4_pure_if([], [