From: Akim Demaille Date: Thu, 2 Aug 2012 13:13:00 +0000 (+0200) Subject: skeletons: renamings after knr removal X-Git-Tag: v2.7.90~359 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/e3f12e0818baab3e61dd30270c54def9ac2f2ad4?ds=inline skeletons: renamings after knr removal * data/c.m4 (b4_yydestruct_generate, b4_yy_symbol_print_generate): Rename as... (b4_yydestruct_define, b4_yy_symbol_print_define): these, for consistency. * data/glr.c, data/glr.cc, data/yacc.c: Adjust. --- diff --git a/data/c.m4 b/data/c.m4 index 6133823d..00209828 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -407,10 +407,10 @@ b4_syncline([@oline@], [@ofile@]) break;]) -# b4_yydestruct_generate -# ---------------------- +# b4_yydestruct_define +# -------------------- # Define the "yydestruct" function. -m4_define_default([b4_yydestruct_generate], +m4_define_default([b4_yydestruct_define], [[/*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -439,10 +439,10 @@ m4_ifset([b4_parse_param], [, b4_parse_param]))[ ]) -# b4_yy_symbol_print_generate -# --------------------------- +# b4_yy_symbol_print_define +# ------------------------- # Define the "yy_symbol_print" function. -m4_define_default([b4_yy_symbol_print_generate], +m4_define_default([b4_yy_symbol_print_define], [[ /*--------------------------------. | Print this symbol on YYOUTPUT. | diff --git a/data/glr.c b/data/glr.c index 511510d8..18a11380 100644 --- a/data/glr.c +++ b/data/glr.c @@ -491,7 +491,7 @@ typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG; YYFPRINTF Args; \ } while (YYID (0)) -]b4_yy_symbol_print_generate[ +]b4_yy_symbol_print_define[ # define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ @@ -872,7 +872,7 @@ yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1) /* Bison grammar-table manipulation. */ -]b4_yydestruct_generate[ +]b4_yydestruct_define[ /** Number of symbols composing the right hand side of rule #RULE. */ static inline int diff --git a/data/glr.cc b/data/glr.cc index 8da5a99a..dae2f62f 100644 --- a/data/glr.cc +++ b/data/glr.cc @@ -61,11 +61,11 @@ m4_define([b4_parser_class_name], m4_define([b4_parse_param_orig], m4_defn([b4_parse_param])) -# b4_yy_symbol_print_generate +# b4_yy_symbol_print_define # --------------------------- # Bypass the default implementation to generate the "yy_symbol_print" # and "yy_symbol_value_print" functions. -m4_define([b4_yy_symbol_print_generate], +m4_define([b4_yy_symbol_print_define], [[ /*--------------------. | Print this symbol. | diff --git a/data/yacc.c b/data/yacc.c index 0083ebed..76121f35 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -714,7 +714,7 @@ do { \ } \ } while (YYID (0)) -]b4_yy_symbol_print_generate[ +]b4_yy_symbol_print_define[ /*------------------------------------------------------------------. | 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 */ -]b4_yydestruct_generate[ +]b4_yydestruct_define[ ]b4_pure_if([], [