Commit 0ab0132c authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Mark end-of-stream conflicts as resolved during conflict resolution.

parent 25c89f9a
......@@ -946,6 +946,9 @@ let default_conflict_resolution () =
an end-of-stream conflict. This conflict is resolved by suppressing
the reduce action at [#]. *)
(* Because we have already removed some reductions above, we may find
fewer end-of-stream conflicts than we did during our first pass. *)
let eos_conflicts = ref 0 in
iter begin fun node ->
......@@ -959,6 +962,9 @@ let default_conflict_resolution () =
TerminalMap.lookup_and_remove Terminal.sharp reductions in
set_reductions node reductions;
(* Mark this end-of-stream conflict as resolved. *)
has_eos_conflict.(raw node) <- None;
(* Count this end-of-stream conflict. *)
incr eos_conflicts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment