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

change more quotes in source, and adjust tests to match

Browse Source 
Run this command to change each `%s' to '%s' in source directories:
  git grep -l '`%s'\' src djgpp data \
    |xargs perl -pi -e '$q="'\''";s/`%s$q/$q%s$q/g'
* data/bison.m4: Affected per the above.
* djgpp/subpipe.c: Likewise.
* src/files.c: Likewise.
* src/getargs.c: Likewise.
* src/muscle-tab.c: Likewise.
* src/reader.c: Likewise.
* tests/glr-regression.at: Adjust to match.
* tests/input.at: Likewise.
* tests/push.at: Likewise.
* tests/skeletons.at: Likewise.
This commit is contained in:
Jim Meyering
2012-01-16 19:36:41 +01:00
parent ae93e4e4b8
commit 4aa9d1ff9c
10 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/bison.m4
View File

@@ -88,7 +88,7 @@ m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])
#
# For example:
#
# b4_error([[warn]], [[invalid value for `%s': %s]], [[foo]], [[3]])
# b4_error([[warn]], [[invalid value for '%s': %s]], [[foo]], [[3]])
m4_define([b4_error],
[b4_cat([[@]$1[(]$2[]]dnl
[m4_if([$#], [2], [],
@@ -117,7 +117,7 @@ m4_define([b4_error_at],
#
# For example:
#
# b4_warn([[invalid value for `%s': %s]], [[foo]], [[3]])
# b4_warn([[invalid value for '%s': %s]], [[foo]], [[3]])
#
# As a simple test suite, this:
#
@@ -542,7 +542,7 @@ m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl
m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl
m4_ifndef($3[(]m4_quote(b4_user_name)[)],
[b4_complain_at([b4_start], [b4_end],
[[%s `%s' is not used]],
[[%s '%s' is not used]],
[$1], [b4_user_name])])[]dnl
m4_popdef([b4_occurrence])dnl
m4_popdef([b4_user_name])dnl
@@ -598,7 +598,7 @@ m4_define([b4_percent_define_get_loc],
[m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl
b4_loc[]dnl
m4_popdef([b4_loc])],
[b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_get_loc]], [$1])])])
[b4_fatal([[undefined %%define variable '%s' passed to b4_percent_define_get_loc]], [$1])])])
# b4_percent_define_get_syncline(VARIABLE)
# ----------------------------------------
@@ -615,7 +615,7 @@ m4_popdef([b4_loc])],
m4_define([b4_percent_define_get_syncline],
[m4_ifdef([b4_percent_define_syncline(]$1[)],
[m4_indir([b4_percent_define_syncline(]$1[)])],
[b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_get_syncline]], [$1])])])
[b4_fatal([[undefined %%define variable '%s' passed to b4_percent_define_get_syncline]], [$1])])])
# b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE])
# ------------------------------------------------------
@@ -656,10 +656,10 @@ m4_define([b4_percent_define_flag_if],
[m4_case(b4_percent_define_get([$1]),
[], [$2], [true], [$2], [false], [$3],
[m4_expand_once([b4_complain_at(b4_percent_define_get_loc([$1]),
[[invalid value for %%define Boolean variable `%s']],
[[invalid value for %%define Boolean variable '%s']],
[$1])],
[[b4_percent_define_flag_if($1)]])])],
[b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_flag_if]], [$1])])])
[b4_fatal([[undefined %%define variable '%s' passed to b4_percent_define_flag_if]], [$1])])])
# b4_percent_define_default(VARIABLE, DEFAULT)
@@ -723,15 +723,15 @@ m4_define([_b4_percent_define_check_values],
[m4_define([b4_good_value], [1])])])])dnl
m4_if(b4_good_value, [0],
[b4_complain_at(b4_percent_define_get_loc([$1]),
[[invalid value for %%define variable `%s': `%s']],
[[invalid value for %%define variable '%s': '%s']],
[$1],
m4_dquote(m4_indir([b4_percent_define(]$1[)])))
m4_foreach([b4_value], m4_dquote(m4_shift($@)),
[b4_complain_at(b4_percent_define_get_loc([$1]),
[[accepted value: `%s']],
[[accepted value: '%s']],
m4_dquote(b4_value))])])dnl
m4_popdef([b4_good_value])],
[b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_check_values]], [$1])])])
[b4_fatal([[undefined %%define variable '%s' passed to b4_percent_define_check_values]], [$1])])])
# b4_percent_code_get([QUALIFIER])
# --------------------------------

14
djgpp/subpipe.c
View File

@@ -60,7 +60,7 @@ static char tmp_file_name[2][L_tmpnam];
do { \
close ((fd)); \
if (unlink ((name))) \
error (EXIT_FAILURE, 0, _("removing of `%s' failed"), (name)); \
error (EXIT_FAILURE, 0, _("removing of '%s' failed"), (name)); \
} while (0)
@@ -231,17 +231,17 @@ end_of_output_subpipe(pid_t pid, int fd[2])
{
remove_tmp_file(STDIN_FILENO, tmp_file_name[0]);
remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]);
error(EXIT_FAILURE, 0, _("subsidiary program `%s' interrupted"), program);
error(EXIT_FAILURE, 0, _("subsidiary program '%s' interrupted"), program);
}
if (status)
{
remove_tmp_file(STDIN_FILENO, tmp_file_name[0]);
remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]);
error(EXIT_FAILURE, 0, _(errno == ENOENT
? "subsidiary program `%s' not found"
? "subsidiary program '%s' not found"
: status < 1
? "subsidiary program `%s' failed"
: "subsidiary program `%s' failed (status=%i, errno=%i)"), program, status, errno);
? "subsidiary program '%s' failed"
: "subsidiary program '%s' failed (status=%i, errno=%i)"), program, status, errno);
}
@@ -283,9 +283,9 @@ reap_subpipe(pid_t pid, char const *program)
free(arguments);
if (unlink(tmp_file_name[0]))
error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[0]);
error(EXIT_FAILURE, 0, _("removing of '%s' failed"), tmp_file_name[0]);
if (unlink(tmp_file_name[1]))
error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[1]);
error(EXIT_FAILURE, 0, _("removing of '%s' failed"), tmp_file_name[1]);
if (dup2(old_stdin, STDIN_FILENO) < 0)
error(EXIT_FAILURE, 0, "restore of bison's stdin failed");

2
src/files.c
View File

@@ -109,7 +109,7 @@ xfopen (const char *name, const char *mode)
ptr = fopen_safer (name, mode);
if (!ptr)
error (EXIT_FAILURE, get_errno (), _("cannot open file `%s'"), name);
error (EXIT_FAILURE, get_errno (), _("cannot open file '%s'"), name);
return ptr;
}

6
src/getargs.c
View File

@@ -421,7 +421,7 @@ language_argmatch (char const *arg, int prio, location loc)
language = &valid_languages[i];
return;
}
msg = _("invalid language `%s'");
msg = _("invalid language '%s'");
}
else if (language_prio == prio)
msg = _("multiple language declarations are invalid");
@@ -679,9 +679,9 @@ getargs (int argc, char *argv[])
if (argc - optind != 1)
{
if (argc - optind < 1)
error (0, 0, _("missing operand after `%s'"), argv[argc - 1]);
error (0, 0, _("missing operand after '%s'"), argv[argc - 1]);
else
error (0, 0, _("extra operand `%s'"), argv[optind + 1]);
error (0, 0, _("extra operand '%s'"), argv[optind + 1]);
usage (EXIT_FAILURE);
}

16
src/muscle-tab.c
View File

@@ -439,7 +439,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
atoi (muscle_find_const (how_name));
if (how_old == MUSCLE_PERCENT_DEFINE_F)
return;
complain_at (variable_loc, _("%%define variable `%s' redefined"),
complain_at (variable_loc, _("%%define variable '%s' redefined"),
variable);
complain_at (muscle_percent_define_get_loc (variable),
_("previous definition"));
@@ -503,7 +503,7 @@ muscle_percent_define_get_loc (char const *variable)
char const *loc_name;
loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
if (!muscle_find_const (loc_name))
fatal(_("undefined %%define variable `%s' passed to"
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_get_loc"), variable);
return muscle_location_decode (loc_name);
}
@@ -517,7 +517,7 @@ muscle_percent_define_get_syncline (char const *variable)
UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
syncline = muscle_find_const (syncline_name);
if (!syncline)
fatal(_("undefined %%define variable `%s' passed to"
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_get_syncline"), variable);
return syncline;
}
@@ -563,13 +563,13 @@ muscle_percent_define_flag_if (char const *variable)
{
muscle_insert (invalid_boolean_name, "");
complain_at(muscle_percent_define_get_loc (variable),
_("invalid value for %%define Boolean variable `%s'"),
_("invalid value for %%define Boolean variable '%s'"),
variable);
}
free (value);
}
else
fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_flag_if"),
fatal(_("undefined %%define variable '%s' passed to muscle_percent_define_flag_if"),
variable);
return result;
@@ -621,10 +621,10 @@ muscle_percent_define_check_values (char const * const *values)
{
location loc = muscle_percent_define_get_loc (*variablep);
complain_at(loc,
_("invalid value for %%define variable `%s': `%s'"),
_("invalid value for %%define variable '%s': '%s'"),
*variablep, value);
for (values = variablep + 1; *values; ++values)
complain_at (loc, _("accepted value: `%s'"), *values);
complain_at (loc, _("accepted value: '%s'"), *values);
}
else
{
@@ -634,7 +634,7 @@ muscle_percent_define_check_values (char const * const *values)
free (value);
}
else
fatal(_("undefined %%define variable `%s' passed to"
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_check_values"),
*variablep);
}

2
src/reader.c
View File

@@ -130,7 +130,7 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
complain_at (declaration_loc,
_("result type clash on merge function `%s': <%s> != <%s>"),
_("result type clash on merge function '%s': <%s> != <%s>"),
merge_function->name, type, merge_function->type);
complain_at (merge_function->type_declaration_location,
_("previous declaration"));

4
tests/glr-regression.at
View File

@@ -1781,9 +1781,9 @@ main (void)
]])
AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],
[glr-regr18.y:26.18-24: result type clash on merge function `merge': <type2> != <type1>
[glr-regr18.y:26.18-24: result type clash on merge function 'merge': <type2> != <type1>
glr-regr18.y:25.18-24: previous declaration
glr-regr18.y:27.13-19: result type clash on merge function `merge': <type3> != <type2>
glr-regr18.y:27.13-19: result type clash on merge function 'merge': <type3> != <type2>
glr-regr18.y:26.18-24: previous declaration
])

88
tests/input.at
View File

@@ -832,10 +832,10 @@ AT_DATA([input-c.y],
start: ;
]])
AT_BISON_CHECK([[input-c.y]], [[1]], [],
[[input-c.y:1.7: %code qualifier `q' is not used
input-c.y:2.7-9: %code qualifier `bad' is not used
input-c.y:3.7-9: %code qualifier `bad' is not used
input-c.y:4.7-12: %code qualifier `format' is not used
[[input-c.y:1.7: %code qualifier 'q' is not used
input-c.y:2.7-9: %code qualifier 'bad' is not used
input-c.y:3.7-9: %code qualifier 'bad' is not used
input-c.y:4.7-12: %code qualifier 'format' is not used
]])
AT_DATA([input-c-glr.y],
@@ -846,9 +846,9 @@ AT_DATA([input-c-glr.y],
start: ;
]])
AT_BISON_CHECK([[input-c-glr.y]], [[1]], [],
[[input-c-glr.y:1.7: %code qualifier `q' is not used
input-c-glr.y:2.7-9: %code qualifier `bad' is not used
input-c-glr.y:3.8-10: %code qualifier `bad' is not used
[[input-c-glr.y:1.7: %code qualifier 'q' is not used
input-c-glr.y:2.7-9: %code qualifier 'bad' is not used
input-c-glr.y:3.8-10: %code qualifier 'bad' is not used
]])
AT_DATA([input-c++.y],
@@ -859,9 +859,9 @@ AT_DATA([input-c++.y],
start: ;
]])
AT_BISON_CHECK([[input-c++.y]], [[1]], [],
[[input-c++.y:1.7: %code qualifier `q' is not used
input-c++.y:2.7-9: %code qualifier `bad' is not used
input-c++.y:3.8: %code qualifier `q' is not used
[[input-c++.y:1.7: %code qualifier 'q' is not used
input-c++.y:2.7-9: %code qualifier 'bad' is not used
input-c++.y:3.8: %code qualifier 'q' is not used
]])
AT_DATA([input-c++-glr.y],
@@ -872,9 +872,9 @@ AT_DATA([input-c++-glr.y],
start: ;
]])
AT_BISON_CHECK([[input-c++-glr.y]], [[1]], [],
[[input-c++-glr.y:1.7-9: %code qualifier `bad' is not used
input-c++-glr.y:2.7: %code qualifier `q' is not used
input-c++-glr.y:3.7: %code qualifier `q' is not used
[[input-c++-glr.y:1.7-9: %code qualifier 'bad' is not used
input-c++-glr.y:2.7: %code qualifier 'q' is not used
input-c++-glr.y:3.7: %code qualifier 'q' is not used
]])
AT_DATA([special-char-@@.y],
@@ -885,9 +885,9 @@ AT_DATA([special-char-@@.y],
start: ;
]])
AT_BISON_CHECK([[special-char-@@.y]], [[1]], [],
[[special-char-@@.y:1.7-9: %code qualifier `bad' is not used
special-char-@@.y:2.7: %code qualifier `q' is not used
special-char-@@.y:3.7: %code qualifier `q' is not used
[[special-char-@@.y:1.7-9: %code qualifier 'bad' is not used
special-char-@@.y:2.7: %code qualifier 'q' is not used
special-char-@@.y:3.7: %code qualifier 'q' is not used
]])
AT_DATA([special-char-@:>@.y],
@@ -898,9 +898,9 @@ AT_DATA([special-char-@:>@.y],
start: ;
]])
AT_BISON_CHECK([[special-char-@:>@.y]], [[1]], [],
[[special-char-@:>@.y:1.7-9: %code qualifier `bad' is not used
special-char-@:>@.y:2.7: %code qualifier `q' is not used
special-char-@:>@.y:3.7: %code qualifier `q' is not used
[[special-char-@:>@.y:1.7-9: %code qualifier 'bad' is not used
special-char-@:>@.y:2.7: %code qualifier 'q' is not used
special-char-@:>@.y:3.7: %code qualifier 'q' is not used
]])
AT_CLEANUP
@@ -923,9 +923,9 @@ start: ;
]])
AT_BISON_CHECK([[input-redefined.y]], [[1]], [],
[[input-redefined.y:2.9-11: %define variable `var' redefined
[[input-redefined.y:2.9-11: %define variable 'var' redefined
input-redefined.y:1.9-11: previous definition
input-redefined.y:3.10-12: %define variable `var' redefined
input-redefined.y:3.10-12: %define variable 'var' redefined
input-redefined.y:2.9-11: previous definition
]])
@@ -936,7 +936,7 @@ start: ;
]])
AT_BISON_CHECK([[input-unused.y]], [[1]], [],
[[input-unused.y:1.9-11: %define variable `var' is not used
[[input-unused.y:1.9-11: %define variable 'var' is not used
]])
AT_CLEANUP
@@ -980,7 +980,7 @@ AT_DATA([[input-dg.y]],
start: ;
]])
AT_BISON_CHECK([[-Dvar=cmd-d input-dg.y]], [[1]], [],
[[input-dg.y:1.9-11: %define variable `var' redefined
[[input-dg.y:1.9-11: %define variable 'var' redefined
<command line>:2: previous definition
]])
@@ -989,8 +989,8 @@ AT_DATA([[input-unused.y]],
start: ;
]])
AT_BISON_CHECK([[-Dunused-d -Funused-f input-unused.y]], [[1]], [],
[[<command line>:2: %define variable `unused-d' is not used
<command line>:3: %define variable `unused-f' is not used
[[<command line>:2: %define variable 'unused-d' is not used
<command line>:3: %define variable 'unused-f' is not used
]])
AT_CLEANUP
@@ -1010,7 +1010,7 @@ start: ;
]])
AT_BISON_CHECK([[Input.y]], [1], [],
[[Input.y:2.9-14: invalid value for %define Boolean variable `public'
[[Input.y:2.9-14: invalid value for %define Boolean variable 'public'
]])
AT_CLEANUP
@@ -1028,10 +1028,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[input.y:1.9-29: invalid value for %define variable `lr.default-reductions': `bogus'
input.y:1.9-29: accepted value: `most'
input.y:1.9-29: accepted value: `consistent'
input.y:1.9-29: accepted value: `accepting'
[[input.y:1.9-29: invalid value for %define variable 'lr.default-reductions': 'bogus'
input.y:1.9-29: accepted value: 'most'
input.y:1.9-29: accepted value: 'consistent'
input.y:1.9-29: accepted value: 'accepting'
]])
# Back-end.
@@ -1041,10 +1041,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
input.y:1.9-21: accepted value: `pull'
input.y:1.9-21: accepted value: `push'
input.y:1.9-21: accepted value: `both'
[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both'
]])
AT_CLEANUP
@@ -1064,10 +1064,10 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-21: invalid value for %define variable `api.push-pull': `neither'
input.y:1.9-21: accepted value: `pull'
input.y:1.9-21: accepted value: `push'
input.y:1.9-21: accepted value: `both'
[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both'
]])
AT_DATA([[input.y]],
@@ -1076,7 +1076,7 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-34: invalid value for %define Boolean variable `lr.keep-unreachable-states'
[[input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
]])
AT_DATA([[input.y]],
@@ -1086,7 +1086,7 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:2.9-21: %define variable `api.namespace' redefined
[[input.y:2.9-21: %define variable 'api.namespace' redefined
input.y:1.9-17: previous definition
]])
@@ -1096,7 +1096,7 @@ AT_DATA([[input.y]],
start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:1.9-15: %define variable `foo_bar' is not used
[[input.y:1.9-15: %define variable 'foo_bar' is not used
]])
AT_CLEANUP
@@ -1121,7 +1121,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:1.9-16: %define variable `api.pure' is not used
[[input.y:1.9-16: %define variable 'api.pure' is not used
]])
])
@@ -1306,11 +1306,11 @@ start: ;
# parse.lac.* options are useless if LAC isn't actually activated.
AT_BISON_CHECK([[-Dparse.lac.es-capacity-initial=1 input.y]],
[[1]], [],
[[<command line>:2: %define variable `parse.lac.es-capacity-initial' is not used
[[<command line>:2: %define variable 'parse.lac.es-capacity-initial' is not used
]])
AT_BISON_CHECK([[-Dparse.lac.memory-trace=full input.y]],
[[1]], [],
[[<command line>:2: %define variable `parse.lac.memory-trace' is not used
[[<command line>:2: %define variable 'parse.lac.memory-trace' is not used
]])
AT_CLEANUP

2
tests/push.at
View File

@@ -163,7 +163,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [],
[[input.y:2.9-21: %define variable `api.push-pull' is not used
[[input.y:2.9-21: %define variable 'api.push-pull' is not used
]])
AT_CLEANUP

6
tests/skeletons.at
View File

@@ -160,7 +160,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[<skeleton default value>: invalid value for %define Boolean variable `foo'
[[<skeleton default value>: invalid value for %define Boolean variable 'foo'
]])
AT_CLEANUP
@@ -228,7 +228,7 @@ start: ;
]])
AT_BISON_CHECK([[input3.y]], [[1]], [[]],
[[input3.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_loc
[[input3.y: fatal error: undefined %define variable 'bogus' passed to b4_percent_define_get_loc
]])
AT_DATA([[skel4.c]],
@@ -242,7 +242,7 @@ start: ;
]])
AT_BISON_CHECK([[input4.y]], [[1]], [[]],
[[input4.y: fatal error: undefined %define variable `bogus' passed to b4_percent_define_get_syncline
[[input4.y: fatal error: undefined %define variable 'bogus' passed to b4_percent_define_get_syncline
]])
AT_CLEANUP