diff options
| author | herbelin | 2003-05-13 22:10:03 +0000 |
|---|---|---|
| committer | herbelin | 2003-05-13 22:10:03 +0000 |
| commit | 1d77fef0f749dc3a629f8ebd29dfebe1311eb497 (patch) | |
| tree | 883ee1b75202153a3e9c7c9fe6df845c4c3a2467 | |
| parent | 6006880b1ab124ae7c229dc3dc513b49229c9813 (diff) | |
Separation entre les propositions de syntaxe - suite
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4005 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | tactics/tacinterp.ml | 1 | ||||
| -rw-r--r-- | translate/ppvernacnew.ml | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tactics/tacinterp.ml b/tactics/tacinterp.ml index c2a1cf4ba5..3f3b4e019f 100644 --- a/tactics/tacinterp.ml +++ b/tactics/tacinterp.ml @@ -2080,6 +2080,7 @@ let make_empty_glob_sign () = metavars = []; gsigma = Evd.empty; genv = Global.env() } let add_tacdef isrec tacl = + let isrec = if !Options.p1 then isrec else true in let rfun = List.map (fun ((loc,id as locid),_) -> (id,make_absolute_name locid)) tacl in let ist = {(make_empty_glob_sign()) with ltacrecvars = if isrec then rfun else []} in diff --git a/translate/ppvernacnew.ml b/translate/ppvernacnew.ml index e0e2c4a654..4a16fbaee4 100644 --- a/translate/ppvernacnew.ml +++ b/translate/ppvernacnew.ml @@ -243,7 +243,7 @@ let anonymize_binder na c = else c let sep_fields () = - if !Options.p1 then str ";" ++ spc () else fnl () + if !Options.p1 then fnl () else str ";" ++ spc () let surround_binder p = if !Options.p1 then str"(" ++ p ++ str")" else p @@ -708,7 +708,7 @@ let rec pr_vernac = function (* Solving *) | VernacSolve (i,tac,deftac) -> - (if i = 1 then mt() else int i ++ str ": ") ++ + (if i = 1 then mt() else int i ++ str ": ") ++ (if !Options.p1 then mt () else str "By ") ++ (if deftac then mt() else str "!! ") ++ pr_raw_tactic_goal i tac @@ -753,9 +753,11 @@ let rec pr_vernac = function (List.map (fun ((_,id),_) -> (id,Lib.make_path id)) l) (Global.env()) body in hov 1 - ((* Rec by default: (if rc then str "Recursive " else mt()) ++ *) - str "Ltac " ++ - prlist_with_sep (fun () -> fnl() ++ str"with ") pr_tac_body l) + ((if !Options.p1 then + (if rc then str "Recursive " else mt()) ++ + str "Tactic Definition " else + (* Rec by default *) str "Ltac ") ++ + prlist_with_sep (fun () -> fnl() ++ str"with ") pr_tac_body l) | VernacHints (dbnames,h) -> pr_hints dbnames h pr_constr | VernacHintDestruct (id,loc,c,i,tac) -> hov 2 (str"HintDestruct " ++ pr_destruct_location loc ++ spc() ++ |