Quote and escape Observable strings and chars

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## NEXT RELEASE
 
-- ...
+- Quote and escape when printing `string` and `char` in the `Observable` module
+  for function generation
 
 ## 0.22
 

example/QCheck_runner_test.expected.ocaml4.32

@@ -82,7 +82,7 @@ Test FAIL_pred_map_commute failed (47 shrink steps):
 
 Test FAIL_fun2_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

example/QCheck_runner_test.expected.ocaml4.64

@@ -82,7 +82,7 @@ Test FAIL_pred_map_commute failed (77 shrink steps):
 
 Test FAIL_fun2_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

example/QCheck_runner_test.expected.ocaml5.32

@@ -82,7 +82,7 @@ Test FAIL_pred_map_commute failed (47 shrink steps):
 
 Test FAIL_fun2_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

example/QCheck_runner_test.expected.ocaml5.64

@@ -82,7 +82,7 @@ Test FAIL_pred_map_commute failed (79 shrink steps):
 
 Test FAIL_fun2_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

src/core/QCheck.ml

@@ -1004,8 +1004,8 @@ module Observable = struct
   let int : int t = make ~hash:H.int ~eq:Eq.int Print.int
   let float : float t = make ~eq:Eq.float Print.float
   let bytes = make ~hash:H.bytes ~eq:Eq.bytes Print.bytes
-  let string = make ~hash:H.string ~eq:Eq.string Print.string
-  let char = make ~hash:H.char ~eq:Eq.char Print.char
+  let string = make ~hash:H.string ~eq:Eq.string (sprintf "%S")
+  let char = make ~hash:H.char ~eq:Eq.char (sprintf "%C")
 
   let option p =
     make ~hash:(H.opt p.hash) ~eq:(Eq.option p.eq)

test/core/QCheck_expect_test.expected.ocaml4.32

@@ -511,7 +511,7 @@ Test fail_pred_map_commute failed (47 shrink steps):
 
 Test fail_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

test/core/QCheck_expect_test.expected.ocaml4.64

@@ -543,7 +543,7 @@ Test fail_pred_map_commute failed (77 shrink steps):
 
 Test fail_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 

test/core/QCheck_expect_test.expected.ocaml5.32

@@ -521,7 +521,7 @@ Test fail_pred_map_commute failed (47 shrink steps):
 
 Test fail_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 
@@ -552,7 +552,7 @@ Test fold_left fold_right uncurried fun last failed (25 shrink steps):
 
 Test fold_left test, fun first failed (66 shrink steps):
 
-({(, 2) -> "a"; _ -> ""}, "", [], [2])
+({("", 2) -> "a"; _ -> ""}, "", [], [2])
 
 --- Failure --------------------------------------------------------------------
 

test/core/QCheck_expect_test.expected.ocaml5.64

@@ -553,7 +553,7 @@ Test fail_pred_map_commute failed (79 shrink steps):
 
 Test fail_pred_strings failed (1 shrink steps):
 
-{some other string -> false; _ -> true}
+{"some other string" -> false; _ -> true}
 
 --- Failure --------------------------------------------------------------------
 
@@ -584,7 +584,7 @@ Test fold_left fold_right uncurried fun last failed (25 shrink steps):
 
 Test fold_left test, fun first failed (66 shrink steps):
 
-({(, 2) -> "a"; _ -> ""}, "", [], [2])
+({("", 2) -> "a"; _ -> ""}, "", [], [2])
 
 --- Failure --------------------------------------------------------------------