[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04-fyi-conflicts.patch
From: |
Akim Demaille |
Subject: |
04-fyi-conflicts.patch |
Date: |
Mon, 12 Nov 2001 10:06:51 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/conflicts.c (count_sr_conflicts, count_rr_conflicts): Return
the result instead of using...
(src_total, rrc_total, src_count, rrc_count): Remove.
(any_conflicts): Remove.
(print_conflicts): Split into...
(conflicts_print, conflicts_output): New.
* src/conflicts.h: Adjust.
* src/main.c (main): Invoke both conflicts_output and conflicts_print.
* src/print.c (print_grammar): Issue `\n' between to rule outputs.
* tests/regression.at (Conflicts): New.
Reported by Tom Lane.
Index: THANKS
--- THANKS Fri, 02 Nov 2001 19:28:01 +0100 akim
+++ THANKS Sat, 10 Nov 2001 13:26:22 +0100 akim
@@ -24,6 +24,7 @@
Richard Stallman address@hidden
Robert Anisko address@hidden
Shura address@hidden
+Tom Lane address@hidden
Wwp address@hidden
Many people are not named here because we lost track of them. We
Index: src/conflicts.c
--- src/conflicts.c Fri, 28 Sep 2001 09:33:42 +0200 akim
+++ src/conflicts.c Sat, 10 Nov 2001 13:28:11 +0100 akim
@@ -28,17 +28,12 @@
#include "reader.h"
#include "LR0.h"
-int any_conflicts = 0;
errs **err_table = NULL;
int expected_conflicts;
static char *conflicts = NULL;
static unsigned *shiftset = NULL;
static unsigned *lookaheadset = NULL;
-static int src_total;
-static int rrc_total;
-static int src_count;
-static int rrc_count;
static inline void
@@ -246,13 +241,8 @@
fp3 = lookaheadset;
while (fp3 < fp4)
- {
- if (*fp2++ & *fp3++)
- {
- conflicts[state] = 1;
- any_conflicts = 1;
- }
- }
+ if (*fp2++ & *fp3++)
+ conflicts[state] = 1;
fp2 = fp1;
fp3 = lookaheadset;
@@ -273,8 +263,6 @@
err_table = XCALLOC (errs *, nstates);
- any_conflicts = 0;
-
for (i = 0; i < nstates; i++)
set_conflicts (i);
}
@@ -284,7 +272,7 @@
| Count the number of shift/reduce conflicts. |
`---------------------------------------------*/
-static void
+static int
count_sr_conflicts (int state)
{
int i;
@@ -296,11 +284,11 @@
unsigned *fp3;
int symbol;
- src_count = 0;
+ int src_count = 0;
shiftp = shift_table[state];
if (!shiftp)
- return;
+ return 0;
for (i = 0; i < tokensetsize; i++)
{
@@ -351,6 +339,8 @@
fp2++;
}
}
+
+ return src_count;
}
@@ -358,33 +348,29 @@
| Count the number of reduce/reduce conflicts. |
`----------------------------------------------*/
-static void
+static int
count_rr_conflicts (int state)
{
int i;
- int j;
- int count;
unsigned mask;
unsigned *baseword;
- unsigned *wordp;
- int m;
- int n;
- rrc_count = 0;
+ int rrc_count = 0;
- m = lookaheads[state];
- n = lookaheads[state + 1];
+ int m = lookaheads[state];
+ int n = lookaheads[state + 1];
if (n - m < 2)
- return;
+ return 0;
mask = 1;
baseword = LA + m * tokensetsize;
for (i = 0; i < ntokens; i++)
{
- wordp = baseword;
+ unsigned *wordp = baseword;
- count = 0;
+ int count = 0;
+ int j;
for (j = m; j < n; j++)
{
if (mask & *wordp)
@@ -403,6 +389,8 @@
baseword++;
}
}
+
+ return rrc_count;
}
/*--------------------------------------------------------------.
@@ -452,56 +440,64 @@
}
-/*---------------------------------------------.
-| Compute and give a report on the conflicts. |
-`---------------------------------------------*/
+/*-----------------------------------------------------------.
+| Output the detailed description of states with conflicts. |
+`-----------------------------------------------------------*/
void
-print_conflicts (FILE *out)
+conflicts_output (FILE *out)
{
int i;
+ for (i = 0; i < nstates; i++)
+ if (conflicts[i])
+ {
+ fprintf (out, _("State %d contains"), i);
+ fputs (conflict_report (count_sr_conflicts (i),
+ count_rr_conflicts (i)), out);
+ }
+}
- src_total = 0;
- rrc_total = 0;
- /* Count the total number of conflicts, and if wanted, give a
- detailed report in FOUTPUT. */
- for (i = 0; i < nstates; i++)
- {
- if (conflicts[i])
- {
- count_sr_conflicts (i);
- count_rr_conflicts (i);
- src_total += src_count;
- rrc_total += rrc_count;
+/*------------------------------------------.
+| Reporting the total number of conflicts. |
+`------------------------------------------*/
- if (verbose_flag)
- {
- fprintf (out, _("State %d contains"), i);
- fputs (conflict_report (src_count, rrc_count), out);
- }
- }
- }
+void
+conflicts_print (void)
+{
+ int i;
+
+ int src_total = 0;
+ int rrc_total = 0;
+
+ /* Conflicts by state. */
+ for (i = 0; i < nstates; i++)
+ if (conflicts[i])
+ {
+ src_total += count_sr_conflicts (i);
+ rrc_total += count_rr_conflicts (i);
+ }
/* Report the total number of conflicts on STDERR. */
- if (yacc_flag)
- {
- /* If invoked with `--yacc', use the output format specified by
- POSIX. */
- fprintf (stderr, _("conflicts: "));
- if (src_total > 0)
- fprintf (stderr, _(" %d shift/reduce"), src_total);
- if (src_total > 0 && rrc_total > 0)
- fprintf (stderr, ",");
- if (rrc_total > 0)
- fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
- putc ('\n', stderr);
- }
- else
- {
- fprintf (stderr, _("%s contains"), infile);
- fputs (conflict_report (src_total, rrc_total), stderr);
- }
+ if (src_total || rrc_total)
+ if (yacc_flag)
+ {
+ /* If invoked with `--yacc', use the output format specified by
+ POSIX. */
+ fprintf (stderr, _("conflicts: "));
+ if (src_total > 0)
+ fprintf (stderr, _(" %d shift/reduce"), src_total);
+ if (src_total > 0 && rrc_total > 0)
+ fprintf (stderr, ",");
+ if (rrc_total > 0)
+ fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
+ putc ('\n', stderr);
+ }
+ else
+ {
+ fprintf (stderr, _("%s contains"), infile);
+ fputs (conflict_report (src_total, rrc_total), stderr);
+ }
}
Index: src/conflicts.h
--- src/conflicts.h Fri, 28 Sep 2001 09:33:42 +0200 akim
+++ src/conflicts.h Sat, 10 Nov 2001 13:22:05 +0100 akim
@@ -23,12 +23,12 @@
# include "state.h"
void solve_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((FILE *out));
+void conflicts_print PARAMS ((void));
+void conflicts_output PARAMS ((FILE *out));
void print_reductions PARAMS ((int));
void free_conflicts PARAMS ((void));
/* Were there conflicts? */
-extern int any_conflicts;
extern errs **err_table;
extern int expected_conflicts;
#endif /* !CONFLICTS_H_ */
Index: src/main.c
--- src/main.c Thu, 11 Oct 2001 19:02:23 +0200 akim
+++ src/main.c Sat, 10 Nov 2001 12:54:13 +0100 akim
@@ -82,6 +82,7 @@
conflicts. Also resolve s/r conflicts based on precedence
declarations. */
solve_conflicts ();
+ conflicts_print ();
/* Output file names. */
compute_output_file_names ();
@@ -91,7 +92,7 @@
if (complain_message_count)
exit (1);
- /* Print information about results, if requested. */
+ /* Output the detailed report on the grammar. */
print_results ();
/* Output the VCG graph. */
Index: src/print.c
--- src/print.c Fri, 28 Sep 2001 09:33:42 +0200 akim
+++ src/print.c Sat, 10 Nov 2001 13:22:29 +0100 akim
@@ -226,7 +226,7 @@
int column = 0;
/* rule # : LHS -> RHS */
- fprintf (out, "\n%s\n", _("Grammar"));
+ fprintf (out, "\n%s\n\n", _("Grammar"));
for (i = 1; i <= nrules; i++)
/* Don't print rules disabled in reduce_grammar_tables. */
if (rlhs[i] >= 0)
@@ -237,7 +237,8 @@
while (*rule > 0)
fprintf (out, " %s", tags[*rule++]);
else
- fprintf (out, " /* %s */\n", _("empty"));
+ fprintf (out, " /* %s */", _("empty"));
+ fputc ('\n', out);
}
/* TERMINAL (type #) : rule #s terminal is on RHS */
@@ -336,8 +337,7 @@
size_t size = obstack_object_size (&output_obstack);
fwrite (obstack_finish (&output_obstack), 1, size, out);
- if (any_conflicts)
- print_conflicts (out);
+ conflicts_output (out);
print_grammar (out);
Index: tests/regression.at
--- tests/regression.at Sat, 10 Nov 2001 12:03:43 +0100 akim
+++ tests/regression.at Sat, 10 Nov 2001 13:18:17 +0100 akim
@@ -43,6 +43,101 @@ exp: '(' exp ')' | NUM ;
AT_CLEANUP([duplicate.*])
+## ----------- ##
+## Conflicts. ##
+## ----------- ##
+
+AT_SETUP([Conflicts])
+
+AT_DATA([input.y],
+[[%token NUM OP
+%%
+exp: exp OP exp | NUM;
+]])
+
+AT_CHECK([bison input.y -o input.c -v], 0, [],
+[input.y contains 1 shift/reduce conflict.
+])
+
+# Check the contents of the report.
+AT_CHECK([cat input.output], [],
+[[State 4 contains 1 shift/reduce conflict.
+
+Grammar
+
+rule 1 exp -> exp OP exp
+rule 2 exp -> NUM
+
+Terminals, with rules where they appear
+
+$ (-1)
+error (256)
+NUM (257) 2
+OP (258) 1
+
+Nonterminals, with rules where they appear
+
+exp (5)
+ on left: 1 2, on right: 1
+
+
+state 0
+
+ NUM shift, and go to state 1
+
+ exp go to state 2
+
+
+
+state 1
+
+ exp -> NUM . (rule 2)
+
+ $default reduce using rule 2 (exp)
+
+
+
+state 2
+
+ exp -> exp . OP exp (rule 1)
+
+ $ go to state 5
+ OP shift, and go to state 3
+
+
+
+state 3
+
+ exp -> exp OP . exp (rule 1)
+
+ NUM shift, and go to state 1
+
+ exp go to state 4
+
+
+
+state 4
+
+ exp -> exp . OP exp (rule 1)
+ exp -> exp OP exp . (rule 1)
+
+ OP shift, and go to state 3
+
+
+
+state 5
+
+ $ go to state 6
+
+
+
+state 6
+
+ $default accept
+]])
+
+AT_CLEANUP(input.c input.output)
+
## ---------------------- ##
## Mixing %token styles. ##
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 04-fyi-conflicts.patch,
Akim Demaille <=