From e672a4ba5e93d116324b75bf5aa0f91ee1d8f988 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 27 Dec 2012 09:45:17 +0100 Subject: [PATCH] maint: which -> whose Apparently, I was confusing both. * data/bison.m4, data/c.m4, data/glr.c, data/lalr1.cc, data/yacc.c: Use "whose" where appropriate. --- data/bison.m4 | 2 +- data/c.m4 | 2 +- data/glr.c | 2 +- data/lalr1.cc | 10 +++++----- data/yacc.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/bison.m4 b/data/bison.m4 index b6d9ed73..0697529f 100644 --- a/data/bison.m4 +++ b/data/bison.m4 @@ -260,7 +260,7 @@ $1([defgoto], [b4_defgoto], [[YYDEFGOTO[NTERM-NUM].]]) $1([table], [b4_table], [[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.]]) $1([check], [b4_check]) diff --git a/data/c.m4 b/data/c.m4 index 0b91ca0d..9342ebe3 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -246,7 +246,7 @@ m4_define([b4_null], [YY_NULL]) # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # ------------------------------------------------------------- -# Define "yy" which contents is CONTENT. +# Define "yy" whose contents is CONTENT. m4_define([b4_integral_parser_table_define], [m4_ifvaln([$3], [b4_comment([$3], [ ])])dnl static const b4_int_type_for([$2]) yy$1[[]] = diff --git a/data/glr.c b/data/glr.c index 97e070d6..106b95a7 100644 --- a/data/glr.c +++ b/data/glr.c @@ -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 0, pointed into by YYCONFLP. */ ]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. [static const short int yyconfl[] = { diff --git a/data/lalr1.cc b/data/lalr1.cc index 91f5c27d..c51f05c9 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -20,7 +20,7 @@ m4_include(b4_pkgdatadir/[c++.m4]) # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT) # -------------------------------------------------------------- -# Declare "parser::yy_" which contents is CONTENT. +# Declare "parser::yy_" whose contents is CONTENT. m4_define([b4_integral_parser_table_declare], [m4_ifval([$3], [b4_comment([$3], [ ]) ])dnl @@ -29,7 +29,7 @@ m4_define([b4_integral_parser_table_declare], # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # ------------------------------------------------------------- -# Define "parser::yy_" which contents is CONTENT. +# Define "parser::yy_" whose contents is CONTENT. m4_define([b4_integral_parser_table_define], [ const b4_int_type_for([$2]) b4_parser_class_name::yy$1_[[]] = @@ -830,7 +830,7 @@ b4_dollar_popdef])[]dnl ]b4_variant_if([[ // Destroy the rhs symbols. 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($$, // $1)"). The value of yylhs.value (hence possibly one of these // 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([[ /* $$ was initialized before running the user action. */ 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. */ yypop_ (yylen); yylen = 0; @@ -957,7 +957,7 @@ b4_dollar_popdef])[]dnl if (!yyempty) 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. */ yypop_ (yylen); while (1 < yystack_.size ()) diff --git a/data/yacc.c b/data/yacc.c index 22fc275a..66acbdae 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -1804,7 +1804,7 @@ yyerrorlab: goto yyerrorlab; ]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. */ YYPOPSTACK (yylen); yylen = 0; @@ -1899,7 +1899,7 @@ yyreturn: yydestruct ("Cleanup: discarding lookahead", 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. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); -- 2.45.2