aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Hugo Herbelin <Hugo.Herbelin@inria.fr>2016-04-27 22:13:04 +0200
committerGravatar Hugo Herbelin <Hugo.Herbelin@inria.fr>2016-04-27 22:13:04 +0200
commit89b38ee15e02349c8d4b05df3170e3c97d8d1bf9 (patch)
treecb92f4b06d109fb2ed0007a4369e2dd203786bd4
parent8aad36675447f3c95dc2f10e26c4cce48595497b (diff)
Revert "Fixing printers for pr_auto_using and pr_firstorder_using."
-rw-r--r--ltac/g_auto.ml411
-rw-r--r--plugins/firstorder/g_ground.ml46
2 files changed, 7 insertions, 10 deletions
diff --git a/ltac/g_auto.ml4 b/ltac/g_auto.ml4
index 601d39b99..d4fd8a1df 100644
--- a/ltac/g_auto.ml4
+++ b/ltac/g_auto.ml4
@@ -50,16 +50,11 @@ let eval_uconstrs ist cs =
} in
List.map (fun c -> Pretyping.type_uconstr ~flags ist c) cs
-let pr_auto_using_raw _ _ _ = Pptactic.pr_auto_using Ppconstr.pr_constr_expr
-let pr_auto_using_glob _ _ _ = Pptactic.pr_auto_using (fun (c,_) -> Printer.pr_glob_constr c)
-let pr_auto_using _ _ _ = Pptactic.pr_auto_using Printer.pr_closed_glob
+let pr_auto_using _ _ _ = Pptactic.pr_auto_using (fun _ -> mt ())
ARGUMENT EXTEND auto_using
+ TYPED AS uconstr_list
PRINTED BY pr_auto_using
- RAW_TYPED AS uconstr_list
- RAW_PRINTED BY pr_auto_using_raw
- GLOB_TYPED AS uconstr_list
- GLOB_PRINTED BY pr_auto_using_glob
| [ "using" ne_uconstr_list_sep(l, ",") ] -> [ l ]
| [ ] -> [ [] ]
END
@@ -197,6 +192,8 @@ ARGUMENT EXTEND hints_path
| [ hints_path(p) ";" hints_path(q) ] -> [ Hints.PathSeq (p, q) ]
END
+let pr_hintbases _prc _prlc _prt = Pptactic.pr_hintbases
+
ARGUMENT EXTEND opthints
TYPED AS preident_list_opt
PRINTED BY pr_hintbases
diff --git a/plugins/firstorder/g_ground.ml4 b/plugins/firstorder/g_ground.ml4
index 47a58d128..587d10d1c 100644
--- a/plugins/firstorder/g_ground.ml4
+++ b/plugins/firstorder/g_ground.ml4
@@ -117,9 +117,9 @@ open Pp
open Genarg
open Ppconstr
open Printer
-let pr_firstorder_using_raw _ _ _ = Pptactic.pr_auto_using pr_reference
-let pr_firstorder_using_glob _ _ _ = Pptactic.pr_auto_using (pr_or_var (fun x -> pr_global (snd x)))
-let pr_firstorder_using_typed _ _ _ = Pptactic.pr_auto_using pr_global
+let pr_firstorder_using_raw _ _ _ l = str "using " ++ prlist_with_sep pr_comma pr_reference l
+let pr_firstorder_using_glob _ _ _ l = str "using " ++ prlist_with_sep pr_comma (pr_or_var (fun x -> (pr_global (snd x)))) l
+let pr_firstorder_using_typed _ _ _ l = str "using " ++ prlist_with_sep pr_comma pr_global l
ARGUMENT EXTEND firstorder_using
PRINTED BY pr_firstorder_using_typed