Catch [Failure _] in Sscanf functions

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Nov 4, 2019 · 5143254 · 5143254
1 parent 1b09275
commit 5143254
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/stdune/scanf.ml b/src/stdune/scanf.ml
@@ -1,13 +1,12 @@
 module Scanf = Dune_caml.Scanf
 
-let unescaped x =
-  match Scanf.unescaped x with
+let try_ f =
+  match f () with
   | exception End_of_file -> Error ()
   | exception Scanf.Scan_failure _ -> Error ()
+  | exception (Failure _) -> Error ()
   | x -> Ok x
 
-let sscanf x fmt f =
-  match Scanf.sscanf x fmt f with
-  | exception End_of_file -> Error ()
-  | exception Scanf.Scan_failure _ -> Error ()
-  | x -> Ok x
+let unescaped x = try_ (fun () -> Scanf.unescaped x)
+
+let sscanf x fmt f = try_ (fun () -> Scanf.sscanf x fmt f)