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

%expext was not functioning at all.

Browse Source 
* src/conflicts.c (expected_conflicts): Set to -1.
(conflict_report): Use ngettext.
(conflicts_print): Check %expect and make its violation an error.
* doc/bison.texinfo (Expect Decl): Adjust.
* configure.in (AM_GNU_GETTEXT): Ask for ngettext.
* tests/regression.at (%expect not enough, %expect right)
(%expect too much): New.
This commit is contained in:
Akim Demaille
2001-11-12 09:33:38 +00:00
parent ba9dda1a2e
commit 7da99edea7
6 changed files with 113 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/conflicts.c
View File

@@ -19,6 +19,7 @@
02111-1307, USA. */
#include "system.h"
#include "complain.h"
#include "getargs.h"
#include "files.h"
#include "gram.h"
@@ -29,7 +30,8 @@
#include "LR0.h"
errs **err_table = NULL;
int expected_conflicts;
/* -1 stands for not specified. */
int expected_conflicts = -1;
static char *conflicts = NULL;
static unsigned *shiftset = NULL;
@@ -404,31 +406,23 @@ conflict_report (int src_num, int rrc_num)
static char res[4096];
char *cp = res;
if (src_num == 1)
if (src_num >= 1)
{
sprintf (cp, _(" 1 shift/reduce conflict"));
cp += strlen (cp);
}
else if (src_num > 1)
{
sprintf (cp, _(" %d shift/reduce conflicts"), src_num);
sprintf (cp, ngettext ("%d shift/reduce conflict",
"%d shift/reduce conflicts", src_num), src_num);
cp += strlen (cp);
}
if (src_num > 0 && rrc_num > 0)
{
sprintf (cp, _(" and"));
sprintf (cp, " %s ", _("and"));
cp += strlen (cp);
}
if (rrc_num == 1)
if (rrc_num >= 1)
{
sprintf (cp, _(" 1 reduce/reduce conflict"));
cp += strlen (cp);
}
else if (rrc_num > 1)
{
sprintf (cp, _(" %d reduce/reduce conflicts"), rrc_num);
sprintf (cp, ngettext ("%d reduce/reduce conflict",
"%d reduce/reduce conflicts", rrc_num), rrc_num);
cp += strlen (cp);
}
@@ -451,7 +445,7 @@ conflicts_output (FILE *out)
for (i = 0; i < nstates; i++)
if (conflicts[i])
{
fprintf (out, _("State %d contains"), i);
fprintf (out, _("State %d contains "), i);
fputs (conflict_report (count_sr_conflicts (i),
count_rr_conflicts (i)), out);
}
@@ -495,9 +489,19 @@ conflicts_print (void)
}
else
{
fprintf (stderr, _("%s contains"), infile);
fprintf (stderr, _("%s contains "), infile);
fputs (conflict_report (src_total, rrc_total), stderr);
}
if (expected_conflicts != -1
&& src_total != expected_conflicts)
{
complain_message_count++;
fprintf (stderr, ngettext ("expected %d shift/reduce conflict",
"expected %d shift/reduce conflicts",
expected_conflicts),
expected_conflicts);
}
}

15
src/main.c
View File

@@ -64,15 +64,16 @@ main (int argc, char *argv[])
if (complain_message_count)
exit (1);
/* find useless nonterminals and productions and reduce the grammar. In
file reduce.c */
/* Find useless nonterminals and productions and reduce the grammar.
In file reduce.c. */
reduce_grammar ();
/* record other info about the grammar. In files derives and nullable. */
/* Record other info about the grammar. In files derives and
nullable. */
set_derives ();
set_nullable ();
/* convert to nondeterministic finite state machine. In file LR0.
/* Convert to nondeterministic finite state machine. In file LR0.
See state.h for more info. */
generate_states ();
@@ -103,14 +104,14 @@ main (int argc, char *argv[])
/* Output the tables and the parser to ftable. In file output. */
output ();
/* Close the input files. */
close_files ();
/* Free the symbol table data structure. */
free_symtab ();
lex_free ();
/* Close the input files. */
close_files ();
reduce_free ();
free_conflicts ();
free_nullable ();