summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <demaille@gostai.com>2012-02-18 15:41:50 +0100
committerAkim Demaille <demaille@gostai.com>2012-02-18 15:41:50 +0100
commit108df813c466663f80ed3cd5c74ec114369863d7 (patch)
tree63e726b5326477bc701ede987da4c3bba2f7e784
parent831a4fdb5eb2d2d459742118bcc2df14ec38c675 (diff)
downloadbison-108df813c466663f80ed3cd5c74ec114369863d7.tar.gz
maint: address a couple of syntax-check errors.
* 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.
-rw-r--r--cfg.mk2
-rw-r--r--lib/bitset_stats.c12
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/files.c2
-rw-r--r--src/symtab.c2
-rw-r--r--tests/glr-regression.at4
6 files changed, 10 insertions, 13 deletions
diff --git a/cfg.mk b/cfg.mk
index 515ac253..18aa4a25 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,8 +36,6 @@ url_dir_list = \
local-checks-to-skip = \
sc_immutable_NEWS \
sc_bindtextdomain \
- sc_error_message_period \
- sc_error_message_uppercase \
sc_program_name \
sc_prohibit_HAVE_MBRTOWC \
sc_prohibit_always-defined_macros \
diff --git a/lib/bitset_stats.c b/lib/bitset_stats.c
index e97af2d8..f6b87146 100644
--- a/lib/bitset_stats.c
+++ b/lib/bitset_stats.c
@@ -256,12 +256,12 @@ bitset_stats_read (const char *file_name)
1, file) != 1)
{
if (ferror (file))
- perror (_("Could not read stats file."));
+ perror (_("cannot read stats file"));
else
- fprintf (stderr, _("Bad stats file size.\n"));
+ fprintf (stderr, _("bad stats file size\n"));
}
if (fclose (file) != 0)
- perror (_("Could not read stats file."));
+ perror (_("cannot read stats file"));
}
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),
1, file) != 1)
- perror (_("Could not write stats file."));
+ perror (_("cannot not write stats file"));
if (fclose (file) != 0)
- perror (_("Could not write stats file."));
+ perror (_("cannot write stats file"));
}
else
- perror (_("Could not open stats file for writing."));
+ perror (_("cannot open stats file for writing"));
}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 62847bb8..0908f506 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,7 @@ src/symtab.c
djgpp/subpipe.c
lib/argmatch.c
lib/bitset_stats.c
+lib/closeout.c
lib/error.c
lib/getopt.c
lib/obstack.c
diff --git a/src/files.c b/src/files.c
index d80b718d..208634cd 100644
--- a/src/files.c
+++ b/src/files.c
@@ -127,7 +127,7 @@ xfclose (FILE *ptr)
return;
if (ferror (ptr))
- error (EXIT_FAILURE, 0, _("I/O error"));
+ error (EXIT_FAILURE, 0, _("input/output error"));
if (fclose (ptr) != 0)
error (EXIT_FAILURE, get_errno (), _("cannot close file"));
diff --git a/src/symtab.c b/src/symtab.c
index 5a595648..b3f94560 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -22,11 +22,9 @@
#include "system.h"
#include <hash.h>
-#include <quotearg.h>
#include "complain.h"
#include "gram.h"
-#include "quote.h"
#include "symtab.h"
/*-------------------------------------------------------------------.
diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 070199ee..a9bff580 100644
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1689,7 +1689,7 @@ empty2: ;
static void
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);
}
@@ -1720,7 +1720,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
AT_COMPILE([glr-regr17])
AT_PARSER_CHECK([[./glr-regr17]], 0, [],
-[Error at 1.1-2.3: syntax is ambiguous.
+[1.1-2.3: syntax is ambiguous.
])
AT_CLEANUP