Make inductive cumulativity flag local to vernacentries

3 files changed, 6 insertions, 17 deletions

diff --git a/lib/flags.ml b/lib/flags.ml
index 768d359cce..1195b8caf1 100644
--- a/lib/flags.ml
+++ b/lib/flags.ml
@@ -101,10 +101,6 @@ let verbosely f x = without_option quiet f x
 let if_silent f x = if !quiet then f x
 let if_verbose f x = if not !quiet then f x
 
-let polymorphic_inductive_cumulativity = ref false
-let make_polymorphic_inductive_cumulativity b = polymorphic_inductive_cumulativity := b
-let is_polymorphic_inductive_cumulativity () = !polymorphic_inductive_cumulativity
-
 let warn = ref true
 let make_warn flag = warn := flag;  ()
 let if_warn f x = if !warn then f x
diff --git a/lib/flags.mli b/lib/flags.mli
index 4ef5fb4445..2b4446a1db 100644
--- a/lib/flags.mli
+++ b/lib/flags.mli
@@ -75,10 +75,6 @@ val verbosely : ('a -> 'b) -> 'a -> 'b
 val if_silent : ('a -> unit) -> 'a -> unit
 val if_verbose : ('a -> unit) -> 'a -> unit
 
-(** Global polymorphic inductive cumulativity flag. *)
-val make_polymorphic_inductive_cumulativity : bool -> unit
-val is_polymorphic_inductive_cumulativity : unit -> bool
-
 val warn : bool ref
 val make_warn : bool -> unit
 val if_warn : ('a -> unit) -> 'a -> unit
diff --git a/vernac/vernacentries.ml b/vernac/vernacentries.ml
index 6c4b0acd52..d511bcd4fd 100644
--- a/vernac/vernacentries.ml
+++ b/vernac/vernacentries.ml
@@ -609,6 +609,11 @@ let vernac_assumption ~atts discharge kind l nl =
   let status = ComAssumption.do_assumptions ~program_mode:atts.program kind nl l in
   if not status then Feedback.feedback Feedback.AddedAxiom
 
+let is_polymorphic_inductive_cumulativity =
+  declare_bool_option_and_ref ~depr:false ~value:false
+    ~name:"Polymorphic inductive cumulativity"
+    ~key:["Polymorphic"; "Inductive"; "Cumulativity"]
+
 let should_treat_as_cumulative cum poly =
   match cum with
   | Some VernacCumulative ->
@@ -617,7 +622,7 @@ let should_treat_as_cumulative cum poly =
   | Some VernacNonCumulative ->
     if poly then false
     else user_err Pp.(str "The NonCumulative prefix can only be used in a polymorphic context.")
-  | None -> poly && Flags.is_polymorphic_inductive_cumulativity ()
+  | None -> poly && is_polymorphic_inductive_cumulativity ()
 
 let get_uniform_inductive_parameters =
   Goptions.declare_bool_option_and_ref
@@ -1564,14 +1569,6 @@ let () =
       optwrite = (fun b -> Flags.raw_print := b) }
 
 let () =
-  declare_bool_option
-    { optdepr  = false;
-      optname  = "Polymorphic inductive cumulativity";
-      optkey   = ["Polymorphic"; "Inductive"; "Cumulativity"];
-      optread  = Flags.is_polymorphic_inductive_cumulativity;
-      optwrite = Flags.make_polymorphic_inductive_cumulativity }
-
-let () =
   declare_int_option
     { optdepr  = false;
       optname  = "the level of inlining during functor application";