diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-10-05 18:18:22 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-10-05 18:18:22 +0200 |
| commit | 2dcd8f2e82366bb3b0f51a42426ccdfbb00281dc (patch) | |
| tree | 4e9a44599dec13e262538e70a6a60bcf3e5fa97e /printing | |
| parent | 01a448be0133872a686e613ab1034b4cb97cd666 (diff) | |
| parent | 8114da3ba8a9b31ffe194e7f7f0239ecc2219b9c (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/ppconstr.ml | 10 | ||||
| -rw-r--r-- | printing/ppvernac.ml | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/printing/ppconstr.ml b/printing/ppconstr.ml index aa0ebbb83..fa5a70899 100644 --- a/printing/ppconstr.ml +++ b/printing/ppconstr.ml @@ -370,13 +370,13 @@ end) = struct let n = begin_of_binders bl in match bl with | [LocalRawAssum (nal,k,t)] -> - pr_com_at n ++ kw() ++ pr_binder false pr_c (nal,k,t) + kw n ++ pr_binder false pr_c (nal,k,t) | (LocalRawAssum _ | LocalPattern _) :: _ as bdl -> - pr_com_at n ++ kw() ++ pr_undelimited_binders sep pr_c bdl + kw n ++ pr_undelimited_binders sep pr_c bdl | _ -> assert false let pr_binders_gen pr_c sep is_open = - if is_open then pr_delimited_binders mt sep pr_c + if is_open then pr_delimited_binders pr_com_at sep pr_c else pr_undelimited_binders sep pr_c let rec extract_prod_binders = function @@ -525,9 +525,9 @@ end) = struct 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_forall n = keyword "forall" ++ pr_com_at n ++ spc () - let pr_fun () = keyword "fun" ++ spc () + let pr_fun n = keyword "fun" ++ pr_com_at n ++ spc () let pr_fun_sep = spc () ++ str "=>" diff --git a/printing/ppvernac.ml b/printing/ppvernac.ml index 1cdf55ac6..7c00106e2 100644 --- a/printing/ppvernac.ml +++ b/printing/ppvernac.ml @@ -1108,6 +1108,11 @@ module Make return ( hov 2 (keyword "Set" ++ spc() ++ pr_set_option na v) ) + | VernacSetAppendOption (na,v) -> + return ( + hov 2 (keyword "Set" ++ spc() ++ pr_printoption na None ++ + spc() ++ keyword "Append" ++ spc() ++ str v) + ) | VernacAddOption (na,l) -> return ( hov 2 (keyword "Add" ++ spc() ++ pr_printoption na (Some l)) |