Attention une mise à jour du service Gitlab va être effectuée le mardi 14 décembre entre 13h30 et 14h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit 287949db authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Renaming.

parent 3b939594
...@@ -931,7 +931,7 @@ let default_conflict_resolution () = ...@@ -931,7 +931,7 @@ let default_conflict_resolution () =
an end-of-stream conflict. This conflict is resolved by suppressing an end-of-stream conflict. This conflict is resolved by suppressing
the reduce action at [#]. *) the reduce action at [#]. *)
let ambiguities = ref 0 in let eos_conflicts = ref 0 in
iter begin fun node -> iter begin fun node ->
let transitions = transitions node let transitions = transitions node
...@@ -947,7 +947,7 @@ let default_conflict_resolution () = ...@@ -947,7 +947,7 @@ let default_conflict_resolution () =
let prod = Misc.single prods in let prod = Misc.single prods in
(* Count this end-of-stream conflict. *) (* Count this end-of-stream conflict. *)
incr ambiguities; incr eos_conflicts;
(* Signal this end-of-stream conflict in the .automaton file. *) (* Signal this end-of-stream conflict in the .automaton file. *)
if Settings.dump then begin if Settings.dump then begin
...@@ -977,11 +977,11 @@ let default_conflict_resolution () = ...@@ -977,11 +977,11 @@ let default_conflict_resolution () =
end end
end; end;
if !ambiguities = 1 then if !eos_conflicts = 1 then
Error.grammar_warning [] "one state has an end-of-stream conflict." Error.grammar_warning [] "one state has an end-of-stream conflict."
else if !ambiguities > 1 then else if !eos_conflicts > 1 then
Error.grammar_warning [] "%d states have an end-of-stream conflict." Error.grammar_warning [] "%d states have an end-of-stream conflict."
!ambiguities; !eos_conflicts;
(* We can now compute where productions are reduced. *) (* We can now compute where productions are reduced. *)
initialize_production_where(); initialize_production_where();
......
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