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

maint: address a couple of syntax-check errors.

Browse Source 
* cfg.mk (local-checks-to-skip): Remove sc_error_message_period
	and sc_error_message_uppercase.
	Address the uncovered issues.
	* po/POTFILES.in: Add missing files.
	* src/symtab.c: Remove useless includes.
	* lib/bitset_stats.c, src/files.c, tests/glr-regression.at: Use
	conformant error messages.
This commit is contained in:
Akim Demaille
2012-02-18 15:41:50 +01:00
parent 831a4fdb5e
commit 108df813c4
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cfg.mk
View File

@@ -36,8 +36,6 @@ url_dir_list = \
local-checks-to-skip = \ local-checks-to-skip = \
sc_immutable_NEWS \ sc_immutable_NEWS \
sc_bindtextdomain \ sc_bindtextdomain \
sc_error_message_period \
sc_error_message_uppercase \
sc_program_name \ sc_program_name \
sc_prohibit_HAVE_MBRTOWC \ sc_prohibit_HAVE_MBRTOWC \
sc_prohibit_always-defined_macros \ sc_prohibit_always-defined_macros \

12
lib/bitset_stats.c
View File

@@ -256,12 +256,12 @@ bitset_stats_read (const char *file_name)
1, file) != 1) 1, file) != 1)
{ {
if (ferror (file)) if (ferror (file))
perror (_("Could not read stats file.")); perror (_("cannot read stats file"));
else else
fprintf (stderr, _("Bad stats file size.\n")); fprintf (stderr, _("bad stats file size\n"));
} }
if (fclose (file) != 0) if (fclose (file) != 0)
perror (_("Could not read stats file.")); perror (_("cannot read stats file"));
} }
bitset_stats_info_data.runs++; bitset_stats_info_data.runs++;
} }
@@ -284,12 +284,12 @@ bitset_stats_write (const char *file_name)
{ {
if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data), if (fwrite (&bitset_stats_info_data, sizeof (bitset_stats_info_data),
1, file) != 1) 1, file) != 1)
perror (_("Could not write stats file.")); perror (_("cannot not write stats file"));
if (fclose (file) != 0) if (fclose (file) != 0)
perror (_("Could not write stats file.")); perror (_("cannot write stats file"));
} }
else else
perror (_("Could not open stats file for writing.")); perror (_("cannot open stats file for writing"));
} }

1
po/POTFILES.in
View File

@@ -20,6 +20,7 @@ src/symtab.c
djgpp/subpipe.c djgpp/subpipe.c
lib/argmatch.c lib/argmatch.c
lib/bitset_stats.c lib/bitset_stats.c
lib/closeout.c
lib/error.c lib/error.c
lib/getopt.c lib/getopt.c
lib/obstack.c lib/obstack.c

2
src/files.c
View File

@@ -127,7 +127,7 @@ xfclose (FILE *ptr)
return; return;
if (ferror (ptr)) if (ferror (ptr))
error (EXIT_FAILURE, 0, _("I/O error")); error (EXIT_FAILURE, 0, _("input/output error"));
if (fclose (ptr) != 0) if (fclose (ptr) != 0)
error (EXIT_FAILURE, get_errno (), _("cannot close file")); error (EXIT_FAILURE, get_errno (), _("cannot close file"));

2
src/symtab.c
View File

@@ -22,11 +22,9 @@
#include "system.h" #include "system.h"
#include <hash.h> #include <hash.h>
#include <quotearg.h>
#include "complain.h" #include "complain.h"
#include "gram.h" #include "gram.h"
#include "quote.h"
#include "symtab.h" #include "symtab.h"
/*-------------------------------------------------------------------. /*-------------------------------------------------------------------.

4
tests/glr-regression.at
View File

@@ -1689,7 +1689,7 @@ empty2: ;
static void static void
yyerror (YYLTYPE *locp, char const *msg) yyerror (YYLTYPE *locp, char const *msg)
{ {
fprintf (stderr, "Error at %d.%d-%d.%d: %s.\n", locp->first_line, fprintf (stderr, "%d.%d-%d.%d: %s.\n", locp->first_line,
locp->first_column, locp->last_line, locp->last_column, msg); locp->first_column, locp->last_line, locp->last_column, msg);
} }
@@ -1720,7 +1720,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
AT_COMPILE([glr-regr17]) AT_COMPILE([glr-regr17])
AT_PARSER_CHECK([[./glr-regr17]], 0, [], AT_PARSER_CHECK([[./glr-regr17]], 0, [],
[Error at 1.1-2.3: syntax is ambiguous. [1.1-2.3: syntax is ambiguous.
]) ])
AT_CLEANUP AT_CLEANUP