Reported by Mike Castle.
* src/conflicts.c (print_reductions): Fix.
* tests/regression.at (Web2c): New.
+2001-12-22 Akim Demaille <akim@epita.fr>
+
+ Reductions in web2c.y are improperly reported.
+ Reported by Mike Castle.
+
+ * src/conflicts.c (print_reductions): Fix.
+ * tests/regression.at (Web2c): New.
+
2001-12-18 Akim Demaille <akim@epita.fr>
Some host fail on `assert (!"foo")', which expands to
* src/lalr.h (nlookaheads): Remove this orphan declaration.
* src/lalr.c (initialize_lookaheads): Set nlookaheads for each
state.
-
+
2001-12-17 Akim Demaille <akim@epita.fr>
* src/files.h, src/files.c (open_files, close_files): Remove.
* src/main.c (main): Don't open/close files, nor invoke lex_free,
let...
* src/reader.c (reader): Do it.
-
+
2001-12-17 Akim Demaille <akim@epita.fr>
* src/conflicts.c (print_reductions): Formatting changes.
-
+
2001-12-17 Akim Demaille <akim@epita.fr>
* src/conflicts.c (flush_shift): Also adjust lookaheadset.
(flush_reduce): New.
(resolve_sr_conflict): Adjust.
-
+
2001-12-17 Akim Demaille <akim@epita.fr>
* src/output.c (output_obstack): Be static and rename as...
2001-12-17 Akim Demaille <akim@epita.fr>
* src/output.c: Various formatting changes.
-
+
2001-12-17 Akim Demaille <akim@epita.fr>
* src/files.c (output_files): Free the output_obstack.
* src/bison.simple: Remove a useless #line directive.
s/#line %%line %%skeleton/#line %%line "%%parser-file-name"/'.
* src/output.c (get_lines_number): New.
- (output_parser): Adjust, now takes care about the lines of a
+ (output_parser): Adjust, now takes care about the lines of a
output muscles.
Fix line numbering.
(actions_output): Computes the number of lines taken by actions.
Keith Browne kbrowne@legato.com
Laurent Mascherpa laurent.mascherpa@epita.fr
Marc Autret autret_m@epita.fr
+Mike Castle dalgoda@ix.netcom.com
Neil Booth NeilB@earthling.net
Nelson H. F. Beebe beebe@math.utah.edu
Noah Friedman friedman@gnu.org
print_reductions (FILE *out, int state)
{
int i;
- int j;
int m = state_table[state]->lookaheadsp;
int n = state_table[state + 1]->lookaheadsp;
shifts *shiftp = state_table[state]->shifts;
}
else if (n - m >= 1)
{
- int k;
-
int cmax = 0;
int default_LA = -1;
int default_rule = 0;
for (i = m; i < n; i++)
{
int count = 0;
+ int j, k;
for (k = 0; k < tokensetsize; ++k)
lookaheadset[k] = LA (i)[k] & ~shiftset[k];
for (i = 0; i < ntokens; i++)
{
+ int j;
int defaulted = 0;
int count = BITISSET (shiftset, i);
for (j = m; j < n; j++)
{
- if (BITISSET (LA (m), j))
+ if (BITISSET (LA (j), i))
{
if (count == 0)
{
AT_TEST_CPP_GUARD_H([input/input])
AT_TEST_CPP_GUARD_H([9foo])
+
+
+
+## ------- ##
+## Web2c. ##
+## ------- ##
+
+# The generation of the reduction was once wrong in Bison, and made it
+# miss some reductions. In the following test case, the reduction on
+# `undef_id_tok' in state 1 was missing. This is stripped down from
+# the actual web2c.y.
+
+AT_SETUP([Web2c])
+
+AT_DATA([input.y],
+[[%token undef_id_tok const_id_tok
+
+%start CONST_DEC_PART
+\f
+%%
+CONST_DEC_PART:
+ CONST_DEC_LIST
+ ;
+
+CONST_DEC_LIST:
+ CONST_DEC
+ | CONST_DEC_LIST CONST_DEC
+ ;
+
+CONST_DEC:
+ { } undef_id_tok '=' const_id_tok ';'
+ ;
+%%
+
+]])
+
+AT_CHECK([bison -v input.y])
+
+AT_CHECK([sed -n 's/ *$//;/^$/!p' input.output], 0,
+[[Grammar
+ Number, Line, Rule
+ 1 6 CONST_DEC_PART -> CONST_DEC_LIST
+ 2 10 CONST_DEC_LIST -> CONST_DEC
+ 3 12 CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC
+ 4 15 @1 -> /* empty */
+ 5 15 CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';'
+Terminals, with rules where they appear
+$ (-1)
+';' (59) 5
+'=' (61) 5
+error (256)
+undef_id_tok (257) 5
+const_id_tok (258) 5
+Nonterminals, with rules where they appear
+CONST_DEC_PART (7)
+ on left: 1
+CONST_DEC_LIST (8)
+ on left: 2 3, on right: 1 3
+CONST_DEC (9)
+ on left: 5, on right: 2 3
+@1 (10)
+ on left: 4, on right: 5
+state 0
+ $default reduce using rule 4 (@1)
+ CONST_DEC_PART go to state 9
+ CONST_DEC_LIST go to state 1
+ CONST_DEC go to state 2
+ @1 go to state 3
+state 1
+ CONST_DEC_PART -> CONST_DEC_LIST . (rule 1)
+ CONST_DEC_LIST -> CONST_DEC_LIST . CONST_DEC (rule 3)
+ undef_id_tok reduce using rule 4 (@1)
+ $default reduce using rule 1 (CONST_DEC_PART)
+ CONST_DEC go to state 4
+ @1 go to state 3
+state 2
+ CONST_DEC_LIST -> CONST_DEC . (rule 2)
+ $default reduce using rule 2 (CONST_DEC_LIST)
+state 3
+ CONST_DEC -> @1 . undef_id_tok '=' const_id_tok ';' (rule 5)
+ undef_id_tok shift, and go to state 5
+state 4
+ CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC . (rule 3)
+ $default reduce using rule 3 (CONST_DEC_LIST)
+state 5
+ CONST_DEC -> @1 undef_id_tok . '=' const_id_tok ';' (rule 5)
+ '=' shift, and go to state 6
+state 6
+ CONST_DEC -> @1 undef_id_tok '=' . const_id_tok ';' (rule 5)
+ const_id_tok shift, and go to state 7
+state 7
+ CONST_DEC -> @1 undef_id_tok '=' const_id_tok . ';' (rule 5)
+ ';' shift, and go to state 8
+state 8
+ CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';' . (rule 5)
+ $default reduce using rule 5 (CONST_DEC)
+state 9
+ $ shift, and go to state 10
+state 10
+ $default accept
+]])
+
+AT_CLEANUP
projects / bison.git / commitdiff
