matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Jérémie Dimino remarks

This commit is contained in:
Christophe Troestler 2018-01-31 02:31:47 +01:00
parent f9e17f76e0
commit cc9c71661e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/usexp/usexp.ml
View File

@ -101,7 +101,7 @@ let rec pp ppf = function
| Atom s ->
Format.pp_print_string ppf (Atom.serialize s)
| Quoted_string s ->
Format.pp_print_string ppf (Atom.serialize s)
Format.pp_print_string ppf (Atom.quote s)
| List [] ->
Format.pp_print_string ppf "()"
| List (first :: rest) ->
@ -128,7 +128,7 @@ let split_string s ~on =
loop 0 0
let rec pp_split_strings ppf = function
| Atom s | Quoted_string s ->
| Atom s ->
if Atom.must_escape s then begin
if String.contains s '\n' then begin
match split_string s ~on:'\n' with
@ -142,6 +142,17 @@ let rec pp_split_strings ppf = function
Format.fprintf ppf "%S" s
end else
Format.pp_print_string ppf s
| Quoted_string s ->
if String.contains s '\n' then begin
match split_string s ~on:'\n' with
| [] -> Format.pp_print_string ppf (Atom.quote s)
| first :: rest ->
Format.fprintf ppf "@[<hv 1>\"@{<atom>%s" (String.escaped first);
List.iter rest ~f:(fun s ->
Format.fprintf ppf "@,\\n%s" (String.escaped s));
Format.fprintf ppf "@}\"@]"
end else
Format.pp_print_string ppf (Atom.quote s)
| List [] ->
Format.pp_print_string ppf "()"
| List (first :: rest) ->