Lines Matching full:conflicts
287 * src/conflicts.c (conflicts_print): Suppress conflict report
288 based on -Wno-conflicts-sr and -Wno-conflicts-rr, and treat
289 conflicts as errors if -Werror.
297 * tests/conflicts.at (-W versus %expect and %expect-rr): New test
442 doc: clean up terminology for mysterious conflicts.
443 * doc/bison.texinfo (Mystery Conflicts): Rename node to...
444 (Mysterious Conflicts): ... this, which is already the section
446 to this node. Also, don't imply that R/R conflicts are the only
496 * doc/bison.texinfo (Mystery Conflicts): Cross-reference
810 * tests/conflicts.at (%nonassoc and eof): Extend to check the
837 * tests/conflicts.at (%error-verbose and consistent errors):
864 * tests/conflicts.at (%error-verbose and consistent
882 * tests/conflicts.at (%error-verbose and consistent errors):
971 turns conflicts into errors not warnings.
977 -Werror: fix for rules useless in parser after conflicts.
1065 * src/complain.h, src/conflicts.c, src/conflicts.h:
1083 * tests/calc.at, tests/conflicts.at, tests/cxx-type.at:
1347 output file whose name conflicts with a previous output file
1584 * tests/conflicts.at (%error-verbose and consistent
1993 * tests/conflicts.at (%nonassoc and eof): Extend to test that it
2063 Fix %error-verbose for conflicts resolved by %nonassoc.
2071 * tests/conflicts.at (%nonassoc and eof): Update expected output
2449 * tests/conflicts.at: Comment changes.
2454 * tests/conflicts.at (%prec with user strings): New.
2636 * tests/conflicts.at (Unreachable States After Conflict
2763 (Mystery Conflicts): Bison is no longer limited to LALR(1)
4038 * tests/conflicts.at: Likewise.
4116 * src/conflicts.c (log_resolution): Implement.
4201 Contents: "Rules useless in parser due to conflicts".
4216 * src/main.c (main): Say "rule useless in parser due to conflicts".
4222 conflicts".
4233 * tests/conflicts.at (S/R in initial): Update expected output.
4401 * tests/conflicts.at (Unreachable States After Conflict Resolution):
4431 * tests/conflicts.at (Unresolved SR Conflicts): Update output.
4432 (Resolved SR Conflicts): Update output.
4467 XML "conflicts" element since a conflict summary is easily extracted
4470 (xsl:template match="state" mode="bison:count-conflicts): New.
4473 "conflicts" element, style the "automaton" element with mode
4474 "conflicts". Unlike the former, the latter lists S/R and R/R
4475 conflicts for a state on the same line.
4476 (xsl:template match="conflicts"): Remove.
4481 (xsl:template match="automaton" mode="conflicts"): New.
4482 (xsl:template match="state" mode="conflicts"): New.
4487 "conflicts" element, style the "automaton" element with mode
4488 "conflicts."
4489 (xsl:template match="conflicts"): Remove.
4491 (xsl:template match="automaton" mode="conflicts"): New.
4492 (xsl:template match="state" mode="conflicts): New.
4493 * src/conflicts.c (conflicts_output_xml): Remove.
4494 * src/conflicts.h (conflicts_output_xml): Remove prototype.
4653 * src/conflicts.c (log_resolution): Fix indenting bugs I introduced.
4688 * src/conflicts.c: Include print-xml.h.
4693 * src/conflicts.h (conflicts_output_val): New decl.
4802 * src/complain.c, src/complain.h, src/conflicts.c:
4803 * src/conflicts.h, src/derives.c, src/derives.h, src/files.c:
4819 * tests/calc.at, tests/conflicts.at, tests/cxx-type.at:
4886 Improve handling of multiple S/R conflicts in the same state and of S/R
4887 conflicts involving multiple reductions.
4888 * src/conflicts.c (resolve_sr_conflict): Don't assign the error action
4891 Similarly, don't finalize and assign the solved conflicts report here
4894 (set_conflicts): Instead, assign them both here after all S/R conflicts
4903 * tests/conflicts.at (Solved conflicts report for multiple reductions
4977 to try to identify its conflicts, and a state must have *rules* to have
4978 conflicts. (2) Labelling a state as inconsistent will affect how
4988 conflicts.c (conflicts_update_state_numbers): Fix for-loop.
5044 * src/LR0.c, src/closure.c, src/closure.h, src/conflicts.c,
5045 src/conflicts.h, src/lalr.c, src/lalr.h, src/print.c,
5046 src/print_graph.c, src/state.c, src/state.h, tests/conflicts.at,
5052 report rules that are then unused, and don't report conflicts in those
5054 * src/conflicts.c, src/conflicts.h (conflicts_update_state_numbers):
5066 * tests/conflicts.at (Unreachable States After Conflict Resolution):
6971 * tests/conflicts.at (yylex): Likewise.
7373 * src/parse-gram.y: Add `%expect 0' so we don't overlook conflicts.
8073 * src/conflicts.c: Update English in comments.
8126 * src/conflicts.h: Likewise.
8235 * tests/conflicts.at, tests/input.at, tests/reduce.at,
8549 * src/conflicts.c (solved_conflicts_obstack): Now static.
8918 * src/conflicts.c (resolve_sr_conflict): Likewise.
8923 * src/conflicts.c (resolve_sr_conflict):
9437 * src/conflicts.c: Likewise.
9525 * src/conflicts.c (conflicts_print): Don't print file name twice
9526 when %expect fails because there were no conflicts.
9529 * tests/conflicts.at (%expect not enough, %expect too much):
9530 (%expect with reduce conflicts): Adjust to new behavior.
9534 * src/conflicts.c (conflicts_print): Unsatisfied %expectation are
10564 * tests/conflicts.at (%nonassoc and eof): Don't exit with status
10698 * doc/bison.texinfo (Mystery Conflicts): Add reference to DeRemer
10967 src/complain.h, src/conflicts.c, src/conflicts.h, src/derives.c,
10980 tests/actions.at, tests/c++.at, tests/calc.at, tests/conflicts.at,
11576 * src/conflicts.c (conflicts): Likewise.
12036 * src/conflicts.c (shift_set): Renamed from shiftset.
12343 * tests/conflicts.at (%nonassoc and eof): Include stdlib.h
12370 * src/conflicts.c (conflicts_print): Correct format string typo:
12422 * src/conflicts.h (expected_sr_conflicts): Rename from
12426 * src/conflicts.c (expected_sr_conflicts): Rename from
12429 (conflicts_print): Check r/r conflicts against expected_rr_conflicts
12553 * tests/conflicts.at: Revamp tests to use %no-default-prec.
12574 * tests/conflicts.at (%default-prec without %prec,
12989 * src/conflicts.c (count_rr_conflicts): Likewise.
13141 * src/conflicts.c (set_conflicts): Resolve all conflicts, not just
13605 * src/conflicts.c (conflicts_print): Likewise.
13606 * tests/conflicts.at (%expect not enough, %expect too much,
13607 %expect with reduce conflicts): Likewise.
13609 that the warning is enabled if the number of conflicts changes
13708 * src/conflicts.c (conflict_report):
13717 * tests/conflicts.at (Unresolved SR Conflicts, Defaulted
13719 %expect with reduce conflicts): Switch to Yacc-style conflict reports.
13758 * src/conflicts.c (conflicts_print): If the user specifies
13760 conflicts. This is what the manual says should happen.
13762 * tests/conflicts.at (%expect with reduce conflicts): New test.
14050 * src/conflicts.c (enum conflict_resolution): Renamed from
14266 * tests/conflicts.at (S/R in initial, Defaulted Conflicted
14410 * src/conflicts.c (resolve_sr_conflict): Likewise.
14518 src/conflicts.c, src/parse-gram.y, src/tables.c, src/tables.h,
14519 tests/action.at, tests/calc.at, tests/conflicts.at,
14587 * tests/actions.at, tests/calc.at, tests/conflicts.at,
15436 * tests/conflicts.at (%nonassoc and eof): Likewise.
15560 * tests/action.at, tests/calc.at, tests/conflicts.at,
15595 * src/print.c (print_state): Separate the list of solved conflicts
15597 * tests/conflicts.at (Resolved SR Conflicts): Adjust.
16210 * src/conflicts.c (conflicts_output): Don't output rules never
16225 * tests/conflicts.at, tests/reduce.at: Adjust.
16240 * src/conflicts.c (resolve_sr_conflict, set_conflicts)
16359 * src/conflicts.c (conflicts_print): Use them.
16362 * tests/conflicts.at, tests/existing.at: Adjust.
16367 by conflicts.
16379 * tests/conflicts.at, tests/regression.at: Adjust.
16397 * src/LR0.c, src/conflicts.c, src/lalr.c, src/output.c
16448 * src/conflicts.c (log_resolution): Fix the message which reversed
16454 * tests/conflicts.at (Resolved SR Conflicts): Likewise.
16613 * src/conflicts.c (conflicts_solve): here.
16624 * src/conflicts.c (resolve_sr_conflict): Don't use an `errs_t' as
16701 * tests/conflicts.at (Defaulted Conflicted Reduction),
16702 (Unresolved SR Conflicts, Resolved SR Conflicts): Adjust.
16712 * tests/conflicts.at (Defaulted Conflicted Reduction),
16713 (Unresolved SR Conflicts): Adjust.
16714 (Unresolved SR Conflicts): Adjust and rename as...
16715 (Resolved SR Conflicts): this, as was meant.
16723 * tests/conflicts.at (Defaulted Conflicted Reduction): New.
16838 * src/LR0.c, src/LR0.h, src/conflicts.c, src/lalr.c, src/lalr.h,
16871 * src/conflicts.c (conflicts_total_count): `i' is unsigned, to
16879 * src/conflicts.c (count_total_conflicts): Change name to
16881 * src/conflicts.h: Ditto.
16955 * src/conflicts.c (count_rr_conflicts): Augment to optionally count
16957 causing conflicts. Needed to size conflict tables.
16971 * src/conflicts.h (count_total_conflicts): New function.
17222 * src/conflicts.c (log_resolution): Accept the rule involved in
17223 the sr conflicts instead of the lookahead number that points to
17276 * tests/conflicts.at (Unresolved SR Conflicts)
17277 (Solved SR Conflicts): Adjust.
17642 * src/conflicts.c (enum conflict_resolution_e): No trailing
17674 * src/conflicts.c (log_resolution): Correct typo:
17681 * src/conflicts.h, src/conflicts.c (print_conflicts)
17685 * src/conflicts.c (enum conflict_resolution_e)
17693 * tests/conflicts.at (Unresolved SR Conflicts)
17694 (Solved SR Conflicts): Exercise --report=all.
18058 * tests/conflicts.at (%nonassoc and eof): Don't use `error.h'.
18161 * tests/conflicts.at (Solved SR Conflicts)
18162 (Unresolved SR Conflicts): Adjust.
18298 * src/reduce.c, src/conflicts.c: Adjust.
18313 * src/print.c, src/conflicts.c: Adjust.
18363 * tests/conflicts.at (Solved SR Conflicts)
18364 (Unresolved SR Conflicts): Adjust.
18366 * tests/conflicts.at (S/R in initial): New.
18455 * src/conflicts.c (log_resolution): Argument `resolution' is const.
18480 * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts)
18481 (Solved SR Conflicts, %expect not enough, %expect right)
18483 * tests/conflicts.at: this new file.
18565 * src/conflicts.c (set_conflicts): Use bitset_disjoint_p.
18573 * src/closure.c, src/conflicts.c, src/lalr.c, src/print.c,
18600 * src/conflicts.c (set_conflicts, count_sr_conflicts): Use
18619 * src/conflicts.c (shiftset, lookaheadset): Now bitset.
18983 * src/conflicts.c (count_rr_conflicts): Fix.
19216 * src/LR0.c, src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c
19227 * src/closure.c, src/conflicts.c, src/derives.c, src/gram.c
19258 * src/conflicts.c (resolve_sr_conflict): Adjust.
19294 * tests/regression.at (Rule Line Numbers, Unresolved SR Conflicts):
19295 (Solved SR Conflicts): Adjust rule 0's line number.
19374 * tests/regression.at (Unresolved SR Conflicts):
19375 (Solved SR Conflicts, Rule Line Numbers): Adjust to the changes
19468 * src/conflicts.c (resolve_sr_conflict): Adjust.
19476 * src/conflicts.c, src/conflicts.h (print_reductions): Move to...
19564 * src/conflicts.c (log_resolution, flush_shift)
19578 * src/conflicts.h: Adjust.
19617 * src/conflicts.c (print_reductions): Fix.
19661 * src/conflicts.c (print_reductions): Formatting changes.
19665 * src/conflicts.c (flush_shift): Also adjust lookaheadset.
19693 * src/conflicts.c (log_resolution): Output only if verbose_flag.
20068 * src/print_graph.c, src/LR0.c, src/LR0.h, src/conflicts.c
20090 * src/conflicts.c (err_table): Remove.
20167 * src/conflicts, src/lalr.c, src/output.c, src/print.c,
20173 * src/conflicts.c: Use it.
20179 * src/conflicts.c (flush_shift, resolve_sr_conflict): De-obfuscate
20186 * src/conflicts.c: Use it to deobfuscate.
20190 * src/conflicts.c (count_sr_conflicts, count_rr_conflicts)
20196 * src/conflicts.c (print_reductions): Arrays, not pointers.
20201 * src/conflicts.c (print_reductions): Pessimize, but clarify.
20205 * src/conflicts.c (print_reductions): Improve variable locality.
20209 * src/conflicts.c (print_reductions): Pessimize, but clarify.
20213 * src/conflicts.c (print_reductions): Improve variable locality.
20406 (Solved SR Conflicts, Unresolved SR Conflicts): Adjust.
20612 * src/conflicts.c (conflicts_print): Don't complain at all when
20613 there are no reduce/reduce conflicts, and as many shift/reduce
20614 conflicts as expected.
20649 * tests/regression.at (Solved SR Conflicts)
20650 (Unresolved SR Conflicts): Adjust.
20672 * src/conflicts.c (conflicts_print): Add a missing \n.
20701 * src/conflicts.c (set_conflicts): Use arrays instead of pointers
20753 * src/LR0.c, src/conflicts.c: Use them to de-obfuscate memory
20792 * src/conflicts.c, src/reader.c, src/reduce.c: Adjust.
20799 * src/print_graph.c, src/closure.c, src/conflicts.c, src/derives.c,
20822 * src/output.c, src/lalr.c, src/print_graph.c, src/conflicts.c:
20835 * src/output.c, src/lalr.c, src/print_graph.c, src/conflicts.c:
20843 * src/output.c, src/lalr.c, src/print_graph.c, src/conflicts.c:
20851 * src/output.c, src/lalr.c, src/print_graph.c, src/conflicts.c:
20862 * src/print_graph.c, src/conflicts.c: Adjust.
20893 * src/conflicts.c (conflict_report): Additional useless pair of
20928 * src/conflicts.c (expected_conflicts): Set to -1.
20938 * tests/regression.at (Conflicts): Rename as...
20939 (Unresolved SR Conflicts): this.
20940 (Solved SR Conflicts): New.
20956 * src/conflicts.c (print_reductions): Accept OUT as argument.
20962 * src/conflicts.c (count_sr_conflicts, count_rr_conflicts): Return
20968 * src/conflicts.h: Adjust.
20971 * tests/regression.at (Conflicts): New.
21096 * src/conflicts.c: Move global variables rrc_total and src_total ...
21244 * src/conflicts.c (initialize_conflicts): Rename as...
21265 * src/conflicts.c (finalize_conflicts): Rename as...
22244 * src/conflicts.c (conflict_report): Be sure not to append to res
22314 * src/conflicts.c: Return a string.
22824 * src/conflicts.c (conflict_report): New function.
22828 * src/conflicts.h: New file.
23423 * src/conflicts.c, src/LR0.c, src/output.c, src/reader.c:
23438 * src/gram.h, src/lalr.c, src/lex.c, src/lex.h, src/machine.h, src/main.c, src/nullable.c, src/output.c, src/print.c, src/reader.c, src/reduce.c, src/state.h, src/symtab.c, src/symtab.h, src/types.h, src/vmsgetargs.c, src/warshall.c, src/allocate.c, src/alloc.h, src/bison.s1, src/closure.c, src/conflicts.c, src/derives.c, src/files.c, src/files.h, src/getargs.c, src/gram.c, src/LR0.c:
23466 * src/allocate.c, src/alloc.h, src/closure.c, src/conflicts.c, src/derives.c, src/getargs.c, src/gram.c, src/lalr.c, src/lex.c, src/LR0.c, src/main.c, src/nullable.c, src/output.c, src/print.c, src/reduce.c, src/symtab.c, src/symtab.h, src/warshall.c:
23606 * src/LR0.c, src/closure.c, src/conflicts.c, src/derives.c, src/files.c, src/lalr.c, src/lex.c, src/nullable.c, src/output.c, src/print.c, src/reader.c, src/reduce.c, src/symtab.c:
23743 * src/reduce.c, src/reader.c, src/print.c, src/output.c, src/nullable.c, src/lex.c, src/lalr.c, src/getargs.c, src/derives.c, src/conflicts.c, src/closure.c, src/allocate.c:
23933 * src/conflicts.c (resolve_sr_conflict):
24041 * src/conflicts.c: entered into RCS
24091 * src/conflicts.c: *** empty log message ***
24192 * src/conflicts.c: New file.
