diff options
| author | herbelin | 2006-09-23 09:36:05 +0000 |
|---|---|---|
| committer | herbelin | 2006-09-23 09:36:05 +0000 |
| commit | 3a4e701b78c0422b019bbac3ea39198126de0677 (patch) | |
| tree | 570e25139303f4bd0923ab5879e9b081d83a6c08 /parsing | |
| parent | 9936e2ba36e1d16dcee047d34b0c4caf8c377726 (diff) | |
Déplacement surround dans util.ml et parenthésage des déclarations
castées si aussi suivies de leur type (p.ex. dans les hypothèses de but),
afin d'éviter des configurations non réinterprétables comme x:nat:nat.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9164 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/ppconstr.ml | 2 | ||||
| -rw-r--r-- | parsing/pptactic.ml | 2 | ||||
| -rw-r--r-- | parsing/prettyp.ml | 1 | ||||
| -rw-r--r-- | parsing/printer.ml | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/parsing/ppconstr.ml b/parsing/ppconstr.ml index ea4a263088..4ac2cbe9e0 100644 --- a/parsing/ppconstr.ml +++ b/parsing/ppconstr.ml @@ -95,8 +95,6 @@ let pr_patnotation = pr_notation_gen decode_patlist_value let pr_delimiters key strm = strm ++ str ("%"^key) -let surround p = hov 1 (str"(" ++ p ++ str")") - let pr_located pr ((b,e),x) = if Options.do_translate() && (b,e)<>dummy_loc then let (b,e) = unloc (b,e) in diff --git a/parsing/pptactic.ml b/parsing/pptactic.ml index 254a789c08..f354ac44f3 100644 --- a/parsing/pptactic.ml +++ b/parsing/pptactic.ml @@ -261,8 +261,6 @@ let rec pr_tacarg_using_rule pr_gen = function | [], [] -> mt () | _ -> failwith "Inconsistent arguments of extended tactic" -let surround p = hov 1 (str"(" ++ p ++ str")") - let pr_extend_gen prgen lev s l = try let tags = List.map genarg_tag l in diff --git a/parsing/prettyp.ml b/parsing/prettyp.ml index d05f4ffd48..fa839587f7 100644 --- a/parsing/prettyp.ml +++ b/parsing/prettyp.ml @@ -246,6 +246,7 @@ let print_safe_judgment env j = let print_named_def name body typ = let pbody = pr_lconstr body in let ptyp = pr_ltype typ in + let pbody = if isCast body then surround pbody else pbody in (str "*** [" ++ str name ++ str " " ++ hov 0 (str ":=" ++ brk (1,2) ++ pbody ++ spc () ++ str ":" ++ brk (1,2) ++ ptyp) ++ diff --git a/parsing/printer.ml b/parsing/printer.ml index 1b069c5ee1..a128eb1a71 100644 --- a/parsing/printer.ml +++ b/parsing/printer.ml @@ -125,6 +125,7 @@ let pr_var_decl env (id,c,typ) = | Some c -> (* Force evaluation *) let pb = pr_lconstr_env env c in + let pb = if isCast c then surround pb else pb in (str" := " ++ pb ++ cut () ) in let pt = pr_ltype_env env typ in let ptyp = (str" : " ++ pt) in @@ -136,6 +137,7 @@ let pr_rel_decl env (na,c,typ) = | Some c -> (* Force evaluation *) let pb = pr_lconstr_env env c in + let pb = if isCast c then surround pb else pb in (str":=" ++ spc () ++ pb ++ spc ()) in let ptyp = pr_ltype_env env typ in match na with |