Plug ARGUMENT EXTEND into the argument extension API.

10 files changed, 57 insertions, 104 deletions

diff --git a/grammar/argextend.mlp b/grammar/argextend.mlp
index d6fe91e8a7..b882d2164f 100644
--- a/grammar/argextend.mlp
+++ b/grammar/argextend.mlp
@@ -21,6 +21,13 @@ END
 let declare_str_items loc l =
   MLast.StDcl (loc, ploc_vala l) (* correspond to <:str_item< declare $list:l'$ end >> *)
 
+let declare_arg loc s e =
+  declare_str_items loc [
+    <:str_item< value ($lid:"wit_"^s$, $lid:s$) = $e$ >>;
+    (** Prevent the unused variable warning *)
+    <:str_item< value _ = ($lid:"wit_"^s$, $lid:s$) >>;
+  ]
+
 let mk_extraarg loc s = <:expr< $lid:"wit_"^s$ >>
 
 let rec make_wit loc = function
@@ -47,39 +54,30 @@ let make_act loc act pil =
 	<:expr< (fun _ -> $make tl$) >> in
   make (List.rev pil)
 
-let make_prod_item = function
+let make_prod_item self = function
   | ExtTerminal s -> <:expr< Extend.Atoken (CLexer.terminal $mlexpr_of_string s$) >>
+  | ExtNonTerminal (Uentry e, _) when e = self -> <:expr< Extend.Aself >>
   | ExtNonTerminal (g, _) ->
     let base s = <:expr< $lid:s$ >> in
     mlexpr_of_prod_entry_key base g
 
-let rec make_prod = function
+let rec make_prod self = function
 | [] -> <:expr< Extend.Stop >>
-| item :: prods -> <:expr< Extend.Next $make_prod prods$ $make_prod_item item$ >>
+| item :: prods -> <:expr< Extend.Next $make_prod self prods$ $make_prod_item self item$ >>
 
-let make_rule loc (prods,act) =
-  <:expr< Extend.Rule $make_prod (List.rev prods)$ $make_act loc act prods$ >>
+let make_rule loc self (prods,act) =
+  <:expr< Extend.Rule $make_prod self (List.rev prods)$ $make_act loc act prods$ >>
 
 let is_ident x = function
 | <:expr< $lid:s$ >> -> (s : string) = x
 | _ -> false
 
-let make_extend loc s cl wit = match cl with
+let make_extend loc self cl = match cl with
 | [[ExtNonTerminal (Uentry e, Some id)], act] when is_ident id act ->
   (** Special handling of identity arguments by not redeclaring an entry *)
-  <:str_item<
-    value $lid:s$ =
-      let () = Pcoq.register_grammar $wit$ $lid:e$ in
-      $lid:e$
-  >>
+  <:expr< Vernacentries.Arg_alias $lid:e$ >>
 | _ ->
-  let se = mlexpr_of_string s in
-  let rules = mlexpr_of_list (make_rule loc) (List.rev cl) in
-  <:str_item<
-    value $lid:s$ =
-      let $lid:s$ = Pcoq.create_generic_entry Pcoq.utactic $se$ (Genarg.rawwit $wit$) in
-      let () = Pcoq.grammar_extend $lid:s$ None (None, [(None, None, $rules$)]) in
-      $lid:s$ >>
+  <:expr< Vernacentries.Arg_rules $mlexpr_of_list (make_rule loc self) (List.rev cl)$ >>
 
 let warning_deprecated prefix s = function
 | None -> ()
@@ -97,94 +95,59 @@ let get_type s = function
 
 let declare_tactic_argument loc s (typ, f, g, h) cl =
   let se = mlexpr_of_string s in
-  let typ, rawpr, globpr, pr = match typ with
+  let typ, pr = match typ with
     | `Uniform (typ, pr) ->
       let typ = get_type s typ in
-      typ, pr, pr, pr
+      typ, <:expr< ($lid:pr$, $lid:pr$, $lid:pr$) >>
     | `Specialized (a, rpr, c, gpr, e, tpr) ->
       let () = warning_deprecated "RAW_" s a in
       let () = warning_deprecated "GLOB_" s c in
-      let toptyp = get_type s e in
-      toptyp, rpr, gpr, tpr
+      let typ = get_type s e in
+      typ, <:expr< ($lid:rpr$, $lid:gpr$, $lid:tpr$) >>
+  in
+  let glob = match g, typ with
+  | Some f, (None | Some _) ->
+    <:expr< Tacentries.ArgInternFun (fun ist v -> (ist, $lid:f$ ist v)) >>
+  | None, Some typ ->
+    <:expr< Tacentries.ArgInternWit $make_wit loc typ$ >>
+  | None, None ->
+    <:expr< Tacentries.ArgInternFun (fun ist v -> (ist, v)) >>
   in
-  let glob = match g with
-    | None ->
-      begin match typ with
-      | None -> <:expr< fun ist v -> (ist, v) >>
-      | Some rawtyp ->
-        <:expr< fun ist v ->
-          let ans = out_gen $make_globwit loc rawtyp$
-          (Tacintern.intern_genarg ist
-          (Genarg.in_gen $make_rawwit loc rawtyp$ v)) in
-          (ist, ans) >>
-      end
-    | Some f ->
-      <:expr< fun ist v -> (ist, $lid:f$ ist v) >>
+  let interp = match f, typ with
+  | Some f, (None | Some _) ->
+    <:expr< Tacentries.ArgInterpLegacy $lid:f$ >>
+  | None, Some typ ->
+    <:expr< Tacentries.ArgInterpWit $make_wit loc typ$ >>
+  | None, None ->
+    <:expr< Tacentries.ArgInterpRet >>
   in
-  let interp = match f with
-    | None ->
-      begin match typ with
-      | None ->
-        let typ = match typ with None -> ExtraArgType s | Some typ -> typ in
-        <:expr< fun ist v -> Ftactic.return (Geninterp.Val.inject (Geninterp.val_tag $make_topwit loc typ$) v) >>
-      | Some globtyp ->
-        <:expr< fun ist x ->
-          Tacinterp.interp_genarg ist (Genarg.in_gen $make_globwit loc globtyp$ x) >>
-      end
-    | Some f ->
-      (** Compatibility layer, TODO: remove me *)
-      let typ = match typ with None -> ExtraArgType s | Some typ -> typ in
-      <:expr<
-        let f = $lid:f$ in
-        fun ist v -> Ftactic.enter (fun gl ->
-          let (sigma, v) = Tacmach.New.of_old (fun gl -> f ist gl v) gl in
-          let v = Geninterp.Val.inject (Geninterp.val_tag $make_topwit loc typ$) v in
-          Proofview.tclTHEN (Proofview.Unsafe.tclEVARS sigma) (Ftactic.return v)
-        )
-      >> in
-  let subst = match h with
-    | None ->
-      begin match typ with
-      | None -> <:expr< fun s v -> v >>
-      | Some globtyp ->
-        <:expr< fun s x ->
-          out_gen $make_globwit loc globtyp$
-          (Tacsubst.subst_genarg s
-            (Genarg.in_gen $make_globwit loc globtyp$ x)) >>
-      end
-    | Some f -> <:expr< $lid:f$>> in
-  let dyn = match typ with
-  | None -> <:expr< None >>
-  | Some typ -> <:expr< Some (Geninterp.val_tag $make_topwit loc typ$) >>
+  let subst = match h, typ with
+  | Some f, (None | Some _) ->
+    <:expr< Tacentries.ArgSubstFun $lid:f$ >>
+  | None, Some typ ->
+    <:expr< Tacentries.ArgSubstWit $make_wit loc typ$ >>
+  | None, None ->
+    <:expr< Tacentries.ArgSubstFun (fun s v -> v) >>
   in
-  let wit = <:expr< $lid:"wit_"^s$ >> in
-  declare_str_items loc
-   [ <:str_item< value ($lid:"wit_"^s$) = Genarg.make0 $se$ >>;
-     <:str_item< Genintern.register_intern0 $wit$ $glob$ >>;
-     <:str_item< Genintern.register_subst0 $wit$ $subst$ >>;
-     <:str_item< Geninterp.register_interp0 $wit$ $interp$ >>;
-     <:str_item< Geninterp.register_val0 $wit$ $dyn$ >>;
-     make_extend loc s cl wit;
-     <:str_item< do {
-      Pptactic.declare_extra_genarg_pprule
-        $wit$ $lid:rawpr$ $lid:globpr$ $lid:pr$;
-      Tacentries.create_ltac_quotation $se$
-        (fun (loc, v) -> Tacexpr.TacGeneric (Genarg.in_gen (Genarg.rawwit $wit$) v))
-        ($lid:s$, None)
-      } >> ]
+  let dyn = mlexpr_of_option (fun typ -> <:expr< Geninterp.val_tag $make_topwit loc typ$ >>) typ in
+  declare_arg loc s <:expr< Tacentries.argument_extend ~{ name = $se$ } {
+    Tacentries.arg_parsing = $make_extend loc s cl$;
+    Tacentries.arg_tag = $dyn$;
+    Tacentries.arg_intern = $glob$;
+    Tacentries.arg_subst = $subst$;
+    Tacentries.arg_interp = $interp$;
+    Tacentries.arg_printer = $pr$
+  } >>
 
 let declare_vernac_argument loc s pr cl =
   let se = mlexpr_of_string s in
-  let wit = <:expr< $lid:"wit_"^s$ >> in
   let pr_rules = match pr with
-    | None -> <:expr< fun _ _ _ _ -> Pp.str $str:"[No printer for "^s^"]"$ >>
-    | Some pr -> <:expr< fun _ _ _ -> $lid:pr$ >> in
-  declare_str_items loc
-   [ <:str_item<
-      value ($lid:"wit_"^s$ : Genarg.genarg_type 'a unit unit) =
-        Genarg.create_arg $se$ >>;
-     make_extend loc s cl wit;
-    <:str_item< Pptactic.declare_extra_vernac_genarg_pprule $wit$ $pr_rules$ >> ]
+    | None -> <:expr< fun _ -> Pp.str $str:"[No printer for "^s^"]"$ >>
+    | Some pr -> <:expr< $lid:pr$ >> in
+  declare_arg loc s <:expr< Vernacentries.vernac_argument_extend ~{ name = $se$ } {
+    Vernacentries.arg_printer = $pr_rules$;
+    Vernacentries.arg_parsing = $make_extend loc s cl$
+  } >>
 
 open Pcaml
 
diff --git a/plugins/extraction/g_extraction.ml4 b/plugins/extraction/g_extraction.ml4
index 93909f3e64..370d3c248f 100644
--- a/plugins/extraction/g_extraction.ml4
+++ b/plugins/extraction/g_extraction.ml4
@@ -15,7 +15,6 @@ DECLARE PLUGIN "extraction_plugin"
 (* ML names *)
 
 open Ltac_plugin
-open Genarg
 open Stdarg
 open Pp
 open Names
diff --git a/plugins/firstorder/g_ground.ml4 b/plugins/firstorder/g_ground.ml4
index ff106404c8..db753fc672 100644
--- a/plugins/firstorder/g_ground.ml4
+++ b/plugins/firstorder/g_ground.ml4
@@ -123,7 +123,6 @@ let normalize_evaluables=
 	   unfold_in_hyp (Lazy.force defined_connectives)
 	   (Tacexpr.InHypType id)) *)
 
-open Genarg
 open Ppconstr
 open Printer
 let pr_firstorder_using_raw _ _ _ = Pptactic.pr_auto_using pr_qualid
diff --git a/plugins/funind/g_indfun.ml4 b/plugins/funind/g_indfun.ml4
index 272852d47a..c7555c44eb 100644
--- a/plugins/funind/g_indfun.ml4
+++ b/plugins/funind/g_indfun.ml4
@@ -13,7 +13,6 @@ open Pp
 open Constrexpr
 open Indfun_common
 open Indfun
-open Genarg
 open Stdarg
 open Tacarg
 open Tactypes
diff --git a/plugins/ltac/extraargs.ml4 b/plugins/ltac/extraargs.ml4
index 0c6d10bf8c..4de27e8138 100644
--- a/plugins/ltac/extraargs.ml4
+++ b/plugins/ltac/extraargs.ml4
@@ -9,7 +9,6 @@
 (************************************************************************)
 
 open Pp
-open Genarg
 open Stdarg
 open Tacarg
 open Pcoq.Prim
diff --git a/plugins/ltac/g_auto.ml4 b/plugins/ltac/g_auto.ml4
index 8eadb66edc..6913543c9a 100644
--- a/plugins/ltac/g_auto.ml4
+++ b/plugins/ltac/g_auto.ml4
@@ -10,7 +10,6 @@
 
 open Pp
 open Constr
-open Genarg
 open Stdarg
 open Pcoq.Prim
 open Pcoq.Constr
diff --git a/plugins/ltac/g_class.ml4 b/plugins/ltac/g_class.ml4
index 1c2f90b670..265368833b 100644
--- a/plugins/ltac/g_class.ml4
+++ b/plugins/ltac/g_class.ml4
@@ -32,8 +32,6 @@ VERNAC COMMAND EXTEND Typeclasses_Rigid_Settings CLASSIFIED AS SIDEFF
     set_transparency cl false ]
 END
 
-open Genarg
-
 let pr_debug _prc _prlc _prt b =
   if b then Pp.str "debug" else Pp.mt()
 
diff --git a/plugins/ssr/ssrparser.ml4 b/plugins/ssr/ssrparser.ml4
index e4a0910673..319f58931a 100644
--- a/plugins/ssr/ssrparser.ml4
+++ b/plugins/ssr/ssrparser.ml4
@@ -15,7 +15,6 @@ open Names
 open Pp
 open Pcoq
 open Ltac_plugin
-open Genarg
 open Stdarg
 open Tacarg
 open Libnames
diff --git a/plugins/ssr/ssrvernac.ml4 b/plugins/ssr/ssrvernac.ml4
index d62656f95f..02a5d08507 100644
--- a/plugins/ssr/ssrvernac.ml4
+++ b/plugins/ssr/ssrvernac.ml4
@@ -25,7 +25,6 @@ open Notation_ops
 open Notation_term
 open Glob_term
 open Stdarg
-open Genarg
 open Decl_kinds
 open Pp
 open Ppconstr
diff --git a/plugins/ssrmatching/g_ssrmatching.ml4 b/plugins/ssrmatching/g_ssrmatching.ml4
index 746c368aa9..9e1f992f38 100644
--- a/plugins/ssrmatching/g_ssrmatching.ml4
+++ b/plugins/ssrmatching/g_ssrmatching.ml4
@@ -9,7 +9,6 @@
 (************************************************************************)
 
 open Ltac_plugin
-open Genarg
 open Pcoq
 open Pcoq.Constr
 open Ssrmatching