Moving Ltac-specific generic arguments to their own file in the ltac/ folder.

2 files changed, 12 insertions, 34 deletions

diff --git a/interp/constrarg.ml b/interp/constrarg.ml
index ca828102b9..aaf33a956a 100644
--- a/interp/constrarg.ml
+++ b/interp/constrarg.ml
@@ -7,7 +7,6 @@
 (************************************************************************)
 
 open Loc
-open Tacexpr
 open Misctypes
 open Genarg
 open Geninterp
@@ -27,14 +26,9 @@ let loc_of_or_by_notation f = function
 let wit_int_or_var =
   make0 ~dyn:(val_tag (topwit Stdarg.wit_int)) "int_or_var"
 
-let wit_intro_pattern : (Constrexpr.constr_expr intro_pattern_expr located, glob_constr_and_expr intro_pattern_expr located, intro_pattern) genarg_type =
+let wit_intro_pattern : (Constrexpr.constr_expr intro_pattern_expr located, Tacexpr.glob_constr_and_expr intro_pattern_expr located, Tacexpr.intro_pattern) genarg_type =
   make0 "intropattern"
 
-let wit_tactic : (raw_tactic_expr, glob_tactic_expr, Val.t) genarg_type =
-  make0 "tactic"
-
-let wit_ltac = make0 ~dyn:(val_tag (topwit Stdarg.wit_unit)) "ltac"
-
 let wit_ident =
   make0 "ident"
 
@@ -61,9 +55,6 @@ let wit_red_expr = make0 "redexpr"
 let wit_clause_dft_concl  =
   make0 "clause_dft_concl"
 
-let wit_destruction_arg =
-  make0 "destruction_arg"
-
 (** Aliases *)
 
 let wit_reference = wit_ref
diff --git a/interp/constrarg.mli b/interp/constrarg.mli
index 6ccd944d43..32f2dc6f38 100644
--- a/interp/constrarg.mli
+++ b/interp/constrarg.mli
@@ -17,7 +17,6 @@ open Globnames
 open Genredexpr
 open Pattern
 open Constrexpr
-open Tacexpr
 open Misctypes
 open Genarg
 
@@ -28,7 +27,7 @@ val loc_of_or_by_notation : ('a -> Loc.t) -> 'a or_by_notation -> Loc.t
 
 val wit_int_or_var : (int or_var, int or_var, int) genarg_type
 
-val wit_intro_pattern : (constr_expr intro_pattern_expr located, glob_constr_and_expr intro_pattern_expr located, intro_pattern) genarg_type
+val wit_intro_pattern : (constr_expr intro_pattern_expr located, Tacexpr.glob_constr_and_expr intro_pattern_expr located, Tacexpr.intro_pattern) genarg_type
 
 val wit_ident : Id.t uniform_genarg_type
 
@@ -38,50 +37,38 @@ val wit_ref : (reference, global_reference located or_var, global_reference) gen
 
 val wit_quant_hyp : quantified_hypothesis uniform_genarg_type
 
-val wit_constr : (constr_expr, glob_constr_and_expr, constr) genarg_type
+val wit_constr : (constr_expr, Tacexpr.glob_constr_and_expr, constr) genarg_type
 
-val wit_uconstr : (constr_expr , glob_constr_and_expr, Glob_term.closed_glob_constr) genarg_type
+val wit_uconstr : (constr_expr , Tacexpr.glob_constr_and_expr, Glob_term.closed_glob_constr) genarg_type
 
 val wit_open_constr :
-  (constr_expr, glob_constr_and_expr, constr) genarg_type
+  (constr_expr, Tacexpr.glob_constr_and_expr, constr) genarg_type
 
 val wit_constr_with_bindings :
   (constr_expr with_bindings,
-  glob_constr_and_expr with_bindings,
-  constr with_bindings delayed_open) genarg_type
+  Tacexpr.glob_constr_and_expr with_bindings,
+  constr with_bindings Pretyping.delayed_open) genarg_type
 
 val wit_bindings :
   (constr_expr bindings,
-  glob_constr_and_expr bindings,
-  constr bindings delayed_open) genarg_type
+  Tacexpr.glob_constr_and_expr bindings,
+  constr bindings Pretyping.delayed_open) genarg_type
 
 val wit_red_expr :
   ((constr_expr,reference or_by_notation,constr_expr) red_expr_gen,
-  (glob_constr_and_expr,evaluable_global_reference and_short_name or_var,glob_constr_pattern_and_expr) red_expr_gen,
+  (Tacexpr.glob_constr_and_expr,evaluable_global_reference and_short_name or_var,Tacexpr.glob_constr_pattern_and_expr) red_expr_gen,
   (constr,evaluable_global_reference,constr_pattern) red_expr_gen) genarg_type
 
-val wit_tactic : (raw_tactic_expr, glob_tactic_expr, Geninterp.Val.t) genarg_type
-
-(** [wit_ltac] is subtly different from [wit_tactic]: they only change for their
-    toplevel interpretation. The one of [wit_ltac] forces the tactic and
-    discards the result. *)
-val wit_ltac : (raw_tactic_expr, glob_tactic_expr, unit) genarg_type
-
 val wit_clause_dft_concl :  (Names.Id.t Loc.located Locus.clause_expr,Names.Id.t Loc.located Locus.clause_expr,Names.Id.t Locus.clause_expr) genarg_type
 
-val wit_destruction_arg :
-  (constr_expr with_bindings destruction_arg,
-   glob_constr_and_expr with_bindings destruction_arg,
-   delayed_open_constr_with_bindings destruction_arg) genarg_type
-
 (** Aliases for compatibility *)
 
 val wit_reference : (reference, global_reference located or_var, global_reference) genarg_type
 val wit_global : (reference, global_reference located or_var, global_reference) genarg_type
 val wit_clause :  (Names.Id.t Loc.located Locus.clause_expr,Names.Id.t Loc.located Locus.clause_expr,Names.Id.t Locus.clause_expr) genarg_type
 val wit_quantified_hypothesis : quantified_hypothesis uniform_genarg_type
-val wit_intropattern : (constr_expr intro_pattern_expr located, glob_constr_and_expr intro_pattern_expr located, intro_pattern) genarg_type
+val wit_intropattern : (constr_expr intro_pattern_expr located, Tacexpr.glob_constr_and_expr intro_pattern_expr located, Tacexpr.intro_pattern) genarg_type
 val wit_redexpr :
   ((constr_expr,reference or_by_notation,constr_expr) red_expr_gen,
-  (glob_constr_and_expr,evaluable_global_reference and_short_name or_var,glob_constr_pattern_and_expr) red_expr_gen,
+  (Tacexpr.glob_constr_and_expr,evaluable_global_reference and_short_name or_var,Tacexpr.glob_constr_pattern_and_expr) red_expr_gen,
   (constr,evaluable_global_reference,constr_pattern) red_expr_gen) genarg_type