diff options
| author | Hugo Herbelin | 2016-04-27 22:13:03 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2016-04-27 22:13:03 +0200 |
| commit | 8e3561074981f115e7767496de6cdb144efcedca (patch) | |
| tree | b42cfcb38a7a4f62df47e6f27e2478b19afe534e | |
| parent | 8877e43d77087720e278080dba37227443802997 (diff) | |
Revert "Fixing printing of Instance."
This reverts commit cbb917476e3920641352c108ec9ffaf6d1682217.
| -rw-r--r-- | printing/ppconstr.ml | 12 | ||||
| -rw-r--r-- | printing/ppconstrsig.mli | 1 | ||||
| -rw-r--r-- | printing/ppvernac.ml | 5 |
3 files changed, 5 insertions, 13 deletions
diff --git a/printing/ppconstr.ml b/printing/ppconstr.ml index ba70145b63..56fbdd5ff5 100644 --- a/printing/ppconstr.ml +++ b/printing/ppconstr.ml @@ -498,11 +498,6 @@ end) = struct pr (lapp,L) a ++ prlist (fun a -> spc () ++ pr_expl_args pr a) l) - let pr_record_body_gen pr l = - spc () ++ - prlist_with_sep pr_semicolon - (fun (id, c) -> h 1 (pr_reference id ++ spc () ++ str":=" ++ pr ltop c)) l - let pr_forall () = keyword "forall" ++ spc () let pr_fun () = keyword "fun" ++ spc () @@ -605,7 +600,10 @@ end) = struct return (pr_app (pr mt) a l, lapp) | CRecord (_,l) -> return ( - hv 0 (str"{|" ++ pr_record_body_gen (pr spc) l ++ str" |}"), + hv 0 (str"{|" ++ spc () ++ + prlist_with_sep pr_semicolon + (fun (id, c) -> h 1 (pr_reference id ++ spc () ++ str":=" ++ pr spc ltop c)) l + ++ str" |}"), latom ) | CCases (_,LetPatternStyle,rtntypopt,[c,as_clause,in_clause],[(_,[(loc,[p])],b)]) -> @@ -738,8 +736,6 @@ end) = struct let pr_cases_pattern_expr = pr_patt ltop - let pr_record_body = pr_record_body_gen pr - let pr_binders = pr_undelimited_binders spc (pr ltop) end diff --git a/printing/ppconstrsig.mli b/printing/ppconstrsig.mli index a59fc6d67d..c711dd8f7f 100644 --- a/printing/ppconstrsig.mli +++ b/printing/ppconstrsig.mli @@ -50,7 +50,6 @@ module type Pp = sig ('a * Names.Id.t) option * recursion_order_expr -> std_ppcmds - val pr_record_body : (reference * constr_expr) list -> std_ppcmds val pr_binders : local_binder list -> std_ppcmds val pr_constr_pattern_expr : constr_pattern_expr -> std_ppcmds val pr_lconstr_pattern_expr : constr_pattern_expr -> std_ppcmds diff --git a/printing/ppvernac.ml b/printing/ppvernac.ml index 42af0f2e61..396add2646 100644 --- a/printing/ppvernac.ml +++ b/printing/ppvernac.ml @@ -895,12 +895,9 @@ module Make | (_, Anonymous), _ -> mt ()) ++ pr_and_type_binders_arg sup ++ str":" ++ spc () ++ - (match bk with Implicit -> str "! " | Explicit -> mt ()) ++ pr_constr cl ++ pr_priority pri ++ (match props with - | Some (true,CRecord (_,l)) -> spc () ++ str":=" ++ spc () ++ str"{" ++ pr_record_body l ++ str "}" - | Some (true,_) -> assert false - | Some (false,p) -> spc () ++ str":=" ++ spc () ++ pr_constr p + | Some (_,p) -> spc () ++ str":=" ++ spc () ++ pr_constr p | None -> mt())) ) |