From 6b45f2d36929162cf92272bb60c2c245d9a0ead3 Mon Sep 17 00:00:00 2001 From: ppedrot Date: Fri, 22 Jun 2012 15:14:30 +0000 Subject: Added an indirection with respect to Loc in Compat. As many [open Compat] were closed (i.e. the only remaining ones are those of printing/parsing). Meanwhile, a simplified interface is provided in loc.mli. This also permits to put Pp in Clib, because it does not depend on CAMLP4/5 anymore. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15475 85f007b7-540e-0410-9357-904b9bb8a0f7 --- dev/printers.mllib | 1 + dev/top_printers.ml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'dev') diff --git a/dev/printers.mllib b/dev/printers.mllib index 03d62e2074..a6d93aa8c5 100644 --- a/dev/printers.mllib +++ b/dev/printers.mllib @@ -4,6 +4,7 @@ Pp_control Compat Flags Pp +Loc Segmenttree Unicodetable Errors diff --git a/dev/top_printers.ml b/dev/top_printers.ml index b3ede70bf7..570ad59ff1 100644 --- a/dev/top_printers.ml +++ b/dev/top_printers.ml @@ -353,7 +353,7 @@ let print_pure_constr csr = let ppfconstr c = ppconstr (Closure.term_of_fconstr c) -let pploc x = let (l,r) = unloc x in +let pploc x = let (l,r) = Loc.unloc x in print_string"(";print_int l;print_string",";print_int r;print_string")" (* extendable tactic arguments *) @@ -428,7 +428,7 @@ let _ = extend_vernac_command_grammar "PrintConstr" None [[GramTerminal "PrintConstr"; GramNonTerminal - (dummy_loc,ConstrArgType,Aentry ("constr","constr"), + (Loc.ghost,ConstrArgType,Aentry ("constr","constr"), Some (Names.id_of_string "c"))]] let _ = @@ -445,7 +445,7 @@ let _ = extend_vernac_command_grammar "PrintPureConstr" None [[GramTerminal "PrintPureConstr"; GramNonTerminal - (dummy_loc,ConstrArgType,Aentry ("constr","constr"), + (Loc.ghost,ConstrArgType,Aentry ("constr","constr"), Some (Names.id_of_string "c"))]] (* Setting printer of unbound global reference *) -- cgit v1.2.3