smaller diff

Author: n-osborne

src/core/QCheck.ml

@@ -92,7 +92,7 @@ let string_fold_right f s acc =
   let rec loop i acc =
     if i<0
     then acc
-    else loop (i-1) (f (String.get s i) acc) in
+    else loop (i-1) (f s.[i] acc) in
   loop (len-1) acc
 
 exception No_example_found of string
@@ -382,9 +382,8 @@ module Gen = struct
   let string_of gen = string_size ~gen nat
   let bytes_printable = bytes_size ~gen:printable nat
   let string_printable = string_size ~gen:printable nat
-  let bytes_readable = bytes_printable
   let string_readable = string_printable
-  let small_bytes ?gen st = bytes_size ?gen small_nat st
+  let bytes_small ?gen st = bytes_size ?gen small_nat st
   let small_string ?gen st = string_size ?gen small_nat st
   let small_list gen = list_size small_nat gen
   let small_array gen = array_size small_nat gen

src/core/QCheck.mli

@@ -417,7 +417,7 @@ module Gen : sig
   (** Generator using the {!printable} character generator.
       @since NEXT_RELEASE *)
 
-  val small_bytes : ?gen:char t -> bytes t
+  val bytes_small : ?gen:char t -> bytes t
   (** Builds a bytes generator, length is {!small_nat}
       Accepts an optional character generator (the default is {!char}).
       @since NEXT_RELEASE *)

src/core/QCheck2.ml

@@ -991,7 +991,7 @@ module Observable = struct
 
     let bool : bool t = (=)
 
-    let float = (=)
+    let float : float t = (=)
 
     let unit () () = true
 
@@ -1518,7 +1518,6 @@ module Test = struct
   let make_neg = make' ~negative:true
 
   let test_get_count (Test cell) = get_count cell
-
   let test_get_long_factor (Test cell) = get_long_factor cell
 
   (** {6 Running the test} *)

test/core/QCheck2_expect_test.expected.64

@@ -819,7 +819,7 @@ stats len:
   8982..9480:                                                                  16
   9481..9979:                                                                  12
 
-+++ Stats for small_bytes len dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++++ Stats for bytes_small len dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 stats len:
   num: 5000, avg: 15.57, stddev: 24.36, median 6, min 0, max 99

test/core/QCheck_expect_test.expected.64

@@ -758,32 +758,7 @@ stats len:
    9000.. 9499:                                                                  13
    9500.. 9999:                                                                  13
 
-+++ Stats for printable_bytes len dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-stats len:
-  num: 5000, avg: 384.53, stddev: 1330.61, median 9, min 0, max 9969
-     0.. 498: #######################################################        4246
-   499.. 997: ######                                                          518
-   998..1496:                                                                  21
-  1497..1995:                                                                  10
-  1996..2494:                                                                  11
-  2495..2993:                                                                  10
-  2994..3492:                                                                  13
-  3493..3991:                                                                  13
-  3992..4490:                                                                   5
-  4491..4989:                                                                  10
-  4990..5488:                                                                  19
-  5489..5987:                                                                   9
-  5988..6486:                                                                  10
-  6487..6985:                                                                  12
-  6986..7484:                                                                  17
-  7485..7983:                                                                  16
-  7984..8482:                                                                  16
-  8483..8981:                                                                  16
-  8982..9480:                                                                  16
-  9481..9979:                                                                  12
-
-+++ Stats for small_bytes len dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++++ Stats for bytes_small len dist ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 stats len:
   num: 5000, avg: 15.57, stddev: 24.36, median 6, min 0, max 99
@@ -1419,7 +1394,7 @@ stats dist:
    4150517416584649600.. 4611686018427387903: #################                                               189
 ================================================================================
 1 warning(s)
-failure (63 tests failed, 3 tests errored, ran 149 tests)
+failure (63 tests failed, 3 tests errored, ran 148 tests)
 random seed: 153870556
 
 +++ Stats for int_dist_empty_bucket ++++++++++++++++++++++++++++++++++++++++++++++++++++++++

test/core/QCheck_tests.ml

@@ -882,7 +882,7 @@ module Stats = struct
       Test.make ~name:"bytes_size len dist"      ~count:5_000 (add_stat len (bytes_of_size (Gen.int_range 5 10))) (fun _ -> true);
       Test.make ~name:"bytes len dist"           ~count:5_000 (add_stat len bytes)                                (fun _ -> true);
       Test.make ~name:"bytes_of len dist"        ~count:5_000 (add_stat len (bytes_gen (Gen.return 'a')))         (fun _ -> true);
-      Test.make ~name:"small_bytes len dist"     ~count:5_000 (add_stat len bytes_small)                          (fun _ -> true);
+      Test.make ~name:"bytes_small len dist"     ~count:5_000 (add_stat len bytes_small)                          (fun _ -> true);
     ]
 
   let string_len_tests =