Merge pull request #404 from jmid/patch-ppx-readme

Update ppx_deriving_qcheck README to new combinator names

Author: jmid

src/ppx_deriving_qcheck/README.md

@@ -14,8 +14,8 @@ let rec rev tree = match tree with
 let test =
   QCheck.Test.make
     ~name:"tree -> rev (rev tree) = tree"
-	(QCheck.make gen_tree)
-	(fun tree -> rev (rev tree) = tree)
+    (QCheck.make gen_tree)
+    (fun tree -> rev (rev tree) = tree)
 ```
 
 For `type tree` we derive two generators:
@@ -51,10 +51,10 @@ This attribute has 2 advantages:
   [@@deriving qcheck]
   ^^^^^^^^^^^^^^^^
   Error: Unbound value gen_my_other_type
-  
+
   (* Possible fix *)
   let gen_my_other_type = (* add your implementation here *)
-  
+
   type my_foo =
   | Foo of my_other_type [@gen gen_my_other_type]
   | Bar of bool
@@ -199,9 +199,9 @@ let gen =
 ## Records
 ```ocaml
 type service = {
-	service_name : string;
-	port : int;
-	protocol : string;
+  service_name : string;
+  port : int;
+  protocol : string;
 } [@@deriving qcheck]
 
 (* ==> *)
@@ -222,7 +222,7 @@ type color = Red | Blue | Green
 (* ==> *)
 
 let gen_color =
-  QCheck.Gen.frequency
+  QCheck.Gen.oneof_weighted
     [(1, (QCheck.Gen.pure Red));
      (1, (QCheck.Gen.pure Blue));
      (1, (QCheck.Gen.pure Green))]
@@ -236,7 +236,7 @@ type color = [ `Red | `Blue | `Green ]
 (* ==> *)
 
 let gen_color =
-  (QCheck.Gen.frequency
+  (QCheck.Gen.oneof_weighted
     [(1, (QCheck.Gen.pure `Red));
      (1, (QCheck.Gen.pure `Blue));
      (1, (QCheck.Gen.pure `Green))] : color QCheck.Gen.t)
@@ -254,10 +254,10 @@ let rec gen_tree_sized n =
   match n with
   | 0 -> QCheck.Gen.map (fun gen0 -> Leaf gen0) QCheck.Gen.int
   | n ->
-    QCheck.Gen.frequency
+    QCheck.Gen.oneof_weighted
       [(1, (QCheck.Gen.map (fun gen0 -> Leaf gen0) QCheck.Gen.int));
        (1,
-		   (QCheck.Gen.map (fun (gen0, gen1) -> Node (gen0, gen1))
+           (QCheck.Gen.map (fun (gen0, gen1) -> Node (gen0, gen1))
              (QCheck.Gen.pair (self (n / 2)) (self (n / 2)))))]))
 
 let gen_tree = QCheck.Gen.sized @@ gen_tree_sized
@@ -273,11 +273,11 @@ type tree = [ `Leaf of int | `Node of tree * tree ]
 let gen_tree =
   (QCheck.Gen.sized @@ QCheck.Gen.fix (fun self -> function
   | 0 ->
-    QCheck.Gen.frequency [
-	  ( 1, QCheck.Gen.map (fun gen0 -> `Leaf gen0) QCheck.Gen.int);
+    QCheck.Gen.oneof_weighted [
+      ( 1, QCheck.Gen.map (fun gen0 -> `Leaf gen0) QCheck.Gen.int);
     ]
   | n ->
-    QCheck.Gen.frequency [
+    QCheck.Gen.oneof_weighted [
       ( 1, QCheck.Gen.map (fun gen0 -> `Leaf gen0) QCheck.Gen.int);
       ( 1,
            QCheck.Gen.map (fun gen0 -> `Node gen0)
@@ -297,7 +297,7 @@ and forest = Nil | Cons of (tree * forest)
 (* ==> *)
 
 let rec gen_tree () =
-  QCheck.Gen.frequency
+  QCheck.Gen.oneof_weighted
     [(1,
       (QCheck.Gen.map (fun gen0 -> Node gen0)
         (QCheck.Gen.map (fun (gen0, gen1) -> (gen0, gen1))
@@ -307,9 +307,9 @@ and gen_forest () =
   QCheck.Gen.sized @@
     (QCheck.Gen.fix
       (fun self -> function
-        | 0 -> QCheck.Gen.frequency [(1, (QCheck.Gen.pure Nil))]
+        | 0 -> QCheck.Gen.oneof_weighted [(1, (QCheck.Gen.pure Nil))]
         | n ->
-          QCheck.Gen.frequency
+          QCheck.Gen.oneof_weighted
             [(1, (QCheck.Gen.pure Nil));
              (1,
                  (QCheck.Gen.map (fun gen0 -> Cons gen0)