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

maint: which -> whose

Browse Source 
Apparently, I was confusing both.

* data/bison.m4, data/c.m4, data/glr.c, data/lalr1.cc, data/yacc.c:
Use "whose" where appropriate.
This commit is contained in:
Akim Demaille
2012-12-27 09:45:17 +01:00
parent 465df9c65c
commit e672a4ba5e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/bison.m4
View File

@@ -260,7 +260,7 @@ $1([defgoto], [b4_defgoto], [[YYDEFGOTO[NTERM-NUM].]])
$1([table], [b4_table], $1([table], [b4_table],
[[YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If [[YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which positive, shift that token. If negative, reduce the rule whose
number is the opposite. If YYTABLE_NINF, syntax error.]]) number is the opposite. If YYTABLE_NINF, syntax error.]])
$1([check], [b4_check]) $1([check], [b4_check])

2
data/c.m4
View File

@@ -246,7 +246,7 @@ m4_define([b4_null], [YY_NULL])
# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
# ------------------------------------------------------------- # -------------------------------------------------------------
# Define "yy<TABLE-NAME>" which contents is CONTENT. # Define "yy<TABLE-NAME>" whose contents is CONTENT.
m4_define([b4_integral_parser_table_define], m4_define([b4_integral_parser_table_define],
[m4_ifvaln([$3], [b4_comment([$3], [ ])])dnl [m4_ifvaln([$3], [b4_comment([$3], [ ])])dnl
static const b4_int_type_for([$2]) yy$1[[]] = static const b4_int_type_for([$2]) yy$1[[]] =

2
data/glr.c
View File

@@ -381,7 +381,7 @@ static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] =
/* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
0, pointed into by YYCONFLP. */ 0, pointed into by YYCONFLP. */
]dnl Do not use b4_int_type_for here, since there are places where ]dnl Do not use b4_int_type_for here, since there are places where
dnl pointers onto yyconfl are taken, which type is "short int *". dnl pointers onto yyconfl are taken, whose type is "short int *".
dnl We probably ought to introduce a type for confl. dnl We probably ought to introduce a type for confl.
[static const short int yyconfl[] = [static const short int yyconfl[] =
{ {

10
data/lalr1.cc
View File

@@ -20,7 +20,7 @@ m4_include(b4_pkgdatadir/[c++.m4])
# b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT) # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT)
# -------------------------------------------------------------- # --------------------------------------------------------------
# Declare "parser::yy<TABLE-NAME>_" which contents is CONTENT. # Declare "parser::yy<TABLE-NAME>_" whose contents is CONTENT.
m4_define([b4_integral_parser_table_declare], m4_define([b4_integral_parser_table_declare],
[m4_ifval([$3], [b4_comment([$3], [ ]) [m4_ifval([$3], [b4_comment([$3], [ ])
])dnl ])dnl
@@ -29,7 +29,7 @@ m4_define([b4_integral_parser_table_declare],
# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT)
# ------------------------------------------------------------- # -------------------------------------------------------------
# Define "parser::yy<TABLE-NAME>_" which contents is CONTENT. # Define "parser::yy<TABLE-NAME>_" whose contents is CONTENT.
m4_define([b4_integral_parser_table_define], m4_define([b4_integral_parser_table_define],
[ const b4_int_type_for([$2]) [ const b4_int_type_for([$2])
b4_parser_class_name::yy$1_[[]] = b4_parser_class_name::yy$1_[[]] =
@@ -830,7 +830,7 @@ b4_dollar_popdef])[]dnl
]b4_variant_if([[ ]b4_variant_if([[
// Destroy the rhs symbols. // Destroy the rhs symbols.
for (int i = 0; i < yylen; ++i) for (int i = 0; i < yylen; ++i)
// Destroy a variant which value may have been swapped with // Destroy a variant whose value may have been swapped with
// yylhs.value (for instance if the action was "std::swap($$, // yylhs.value (for instance if the action was "std::swap($$,
// $1)"). The value of yylhs.value (hence possibly one of these // $1)"). The value of yylhs.value (hence possibly one of these
// rhs symbols) depends on the default construction for this // rhs symbols) depends on the default construction for this
@@ -897,7 +897,7 @@ b4_dollar_popdef])[]dnl
yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[ yyerror_range[1].location = yystack_[yylen - 1].location;]])b4_variant_if([[
/* $$ was initialized before running the user action. */ /* $$ was initialized before running the user action. */
yy_destroy_ ("Error: discarding", yylhs);]])[ yy_destroy_ ("Error: discarding", yylhs);]])[
/* Do not reclaim the symbols of the rule which action triggered /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */ this YYERROR. */
yypop_ (yylen); yypop_ (yylen);
yylen = 0; yylen = 0;
@@ -957,7 +957,7 @@ b4_dollar_popdef])[]dnl
if (!yyempty) if (!yyempty)
yy_destroy_ ("Cleanup: discarding lookahead", yyla); yy_destroy_ ("Cleanup: discarding lookahead", yyla);
/* Do not reclaim the symbols of the rule which action triggered /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */ this YYABORT or YYACCEPT. */
yypop_ (yylen); yypop_ (yylen);
while (1 < yystack_.size ()) while (1 < yystack_.size ())

4
data/yacc.c
View File

@@ -1804,7 +1804,7 @@ yyerrorlab:
goto yyerrorlab; goto yyerrorlab;
]b4_locations_if([[ yyerror_range[1] = yylsp[1-yylen]; ]b4_locations_if([[ yyerror_range[1] = yylsp[1-yylen];
]])[ /* Do not reclaim the symbols of the rule which action triggered ]])[ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */ this YYERROR. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
yylen = 0; yylen = 0;
@@ -1899,7 +1899,7 @@ yyreturn:
yydestruct ("Cleanup: discarding lookahead", yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[); yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[);
} }
/* Do not reclaim the symbols of the rule which action triggered /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */ this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp);