Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use String.escaped in Scanf.format_from_string

master
Nicolás Ojeda Bär 2018-06-06 13:56:25 +02:00
parent c518af01c3
commit fa7dc54819
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stdlib/scanf.ml
View File

@ -1547,21 +1547,8 @@ let sscanf_format :
fun s format f -> bscanf_format (Scanning.from_string s) format f
let string_to_String s =
let l = String.length s in
let b = Buffer.create (l + 2) in
Buffer.add_char b '\"';
for i = 0 to l - 1 do
let c = s.[i] in
if c = '\"' then Buffer.add_char b '\\';
Buffer.add_char b c;
done;
Buffer.add_char b '\"';
Buffer.contents b
let format_from_string s fmt =
sscanf_format (string_to_String s) fmt (fun x -> x)
sscanf_format ("\"" ^ String.escaped s ^ "\"") fmt (fun x -> x)
let unescaped s =