Merge pull request #2634 from chenglou/whatever

Revert the uncurried doc categorization changes

Author: bobzhang

jscomp/others/belt_Array.mli

@@ -30,7 +30,7 @@
 
     For example:
     {[
-      type t = int
+      type t = int 
       module I0 =
         (val Belt.Id.hashableU
             ~hash:(fun[\@bs] (a : t)  -> a & 0xff_ff)
@@ -75,13 +75,13 @@ module Int = Belt_HashMapInt
 
 
 (** Specalized when key type is [string], more efficient
-    than the gerneic type *)
+    than the gerneic type *)  
 module String = Belt_HashMapString
 
 
 
 
-type ('key,'value,'id) t
+type ('key,'value,'id) t 
 (** The type of hash tables from type ['key] to type ['value]. *)
 
 type ('a, 'id) id = ('a, 'id) Belt_Id.hashable
@@ -93,30 +93,32 @@ val make:  hintSize:int -> id:('key, 'id) id -> ('key,'value,'id) t
 val clear: ('key, 'value, 'id ) t -> unit
 (** Empty a hash table. *)
 
-val isEmpty: _ t -> bool
+val isEmpty: _ t -> bool  
 
 val set: ('key, 'value, 'id ) t -> 'key -> 'value -> unit
 (** [set tbl k v] if [k] does not exist,
      add the binding [k,v], otherwise, update the old value with the new
      [v]
 *)
-
+  
 val copy: ('key, 'value, 'id ) t -> ('key, 'value, 'id ) t
-
+    
 val get: ('key, 'value, 'id ) t -> 'key -> 'value option
 
-
+  
 val has: ('key, 'value, 'id ) t -> 'key -> bool
 (** [has tbl x] checks if [x] is bound in [tbl]. *)
 
 val remove: ('key, 'value, 'id ) t -> 'key ->  unit
 
+val forEachU: ('key, 'value, 'id ) t -> ('key -> 'value -> unit [@bs]) -> unit
 val forEach: ('key, 'value, 'id ) t -> ('key -> 'value -> unit) -> unit
 (** [forEach tbl f] applies [f] to all bindings in table [tbl].
     [f] receives the key as first argument, and the associated value
     as second argument. Each binding is presented exactly once to [f].
 *)
 
+val reduceU: ('key, 'value, 'id ) t -> 'c -> ('c -> 'key -> 'value ->  'c [@bs]) ->  'c
 val reduce: ('key, 'value, 'id ) t -> 'c -> ('c -> 'key -> 'value ->  'c) ->  'c
 (** [reduce  tbl init f] computes
     [(f kN dN ... (f k1 d1 init)...)],
@@ -131,10 +133,11 @@ val reduce: ('key, 'value, 'id ) t -> 'c -> ('c -> 'key -> 'value ->  'c) ->  'c
 *)
 
 
+val keepMapInPlaceU: ('key, 'value, 'id ) t -> ('key -> 'value -> 'value option [@bs]) ->  unit
 val keepMapInPlace: ('key, 'value, 'id ) t -> ('key -> 'value -> 'value option ) ->  unit
 
 
-val size: _ t -> int
+val size: _ t -> int  
 (** [size tbl] returns the number of bindings in [tbl].
     It takes constant time. *)
 
@@ -143,23 +146,14 @@ val size: _ t -> int
 
 
 
-val toArray: ('key, 'value, 'id ) t -> ('key * 'value) array
-val keysToArray: ('key, _, _) t -> 'key array
-val valuesToArray: (_,'value,_) t -> 'value array
-val fromArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t
+val toArray: ('key, 'value, 'id ) t -> ('key * 'value) array 
+val keysToArray: ('key, _, _) t -> 'key array    
+val valuesToArray: (_,'value,_) t -> 'value array    
+val fromArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t    
 val mergeMany: ('key, 'value, 'id ) t -> ('key * 'value) array -> unit
 val getBucketHistogram: _ t -> int array
 val logStats: _ t -> unit
 
-val ofArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t
+val ofArray: ('key * 'value) array -> id:('key,'id) id -> ('key, 'value, 'id ) t    
 [@@ocaml.deprecated "Use fromArray instead"]
 
-
-(** {1 Uncurried version} *)
-
-
-val forEachU: ('key, 'value, 'id ) t -> ('key -> 'value -> unit [@bs]) -> unit
-
-val reduceU: ('key, 'value, 'id ) t -> 'c -> ('c -> 'key -> 'value ->  'c [@bs]) ->  'c
-
-val keepMapInPlaceU: ('key, 'value, 'id ) t -> ('key -> 'value -> 'value option [@bs]) ->  unit

jscomp/others/belt_HashMap.mli

@@ -3,37 +3,40 @@ type key = int
 
 
 # 10 "hashmap.cppo.mli"
-type 'b t
+type 'b t 
 
 
-val make:  hintSize:int -> 'b t
+val make:  hintSize:int -> 'b t 
 
 val clear: 'b t -> unit
 
 val isEmpty: _ t -> bool
-
+  
 val set: 'a t -> key -> 'a -> unit
 (** [setDone tbl k v] if [k] does not exist,
     add the binding [k,v], otherwise, update the old value with the new
     [v]
 *)
+  
 
-
-val copy: 'a t -> 'a t
+val copy: 'a t -> 'a t 
 val get:  'a t -> key -> 'a option
 
 val has:  'b  t -> key -> bool
 
 val remove: 'a t -> key -> unit
 
+val forEachU: 'b t -> (key -> 'b -> unit [@bs]) -> unit
 val forEach: 'b t -> (key -> 'b -> unit) -> unit
 
+val reduceU: 'b t -> 'c -> ('c -> key -> 'b ->  'c [@bs]) -> 'c
 val reduce: 'b t -> 'c -> ('c -> key -> 'b ->  'c) -> 'c
 
+val keepMapInPlaceU: 'a t ->  (key -> 'a -> 'a option [@bs]) -> unit
 val keepMapInPlace: 'a t ->  (key -> 'a -> 'a option) -> unit
 
-
-val size: _ t -> int
+  
+val size: _ t -> int  
 
 
 val toArray: 'a t -> (key * 'a) array
@@ -46,11 +49,3 @@ val logStats: _ t -> unit
 
 val ofArray: (key * 'a) array -> 'a t
 [@@ocaml.deprecated "Use fromArray instead"]
-
-
-(** {1 Uncurried version} *)
-
-
-val forEachU: 'b t -> (key -> 'b -> unit [@bs]) -> unit
-val reduceU: 'b t -> 'c -> ('c -> key -> 'b ->  'c [@bs]) -> 'c
-val keepMapInPlaceU: 'a t ->  (key -> 'a -> 'a option [@bs]) -> unit

jscomp/others/belt_HashMapInt.mli

@@ -3,37 +3,40 @@ type key = string
 
 
 # 10 "hashmap.cppo.mli"
-type 'b t
+type 'b t 
 
 
-val make:  hintSize:int -> 'b t
+val make:  hintSize:int -> 'b t 
 
 val clear: 'b t -> unit
 
 val isEmpty: _ t -> bool
-
+  
 val set: 'a t -> key -> 'a -> unit
 (** [setDone tbl k v] if [k] does not exist,
     add the binding [k,v], otherwise, update the old value with the new
     [v]
 *)
+  
 
-
-val copy: 'a t -> 'a t
+val copy: 'a t -> 'a t 
 val get:  'a t -> key -> 'a option
 
 val has:  'b  t -> key -> bool
 
 val remove: 'a t -> key -> unit
 
+val forEachU: 'b t -> (key -> 'b -> unit [@bs]) -> unit
 val forEach: 'b t -> (key -> 'b -> unit) -> unit
 
+val reduceU: 'b t -> 'c -> ('c -> key -> 'b ->  'c [@bs]) -> 'c
 val reduce: 'b t -> 'c -> ('c -> key -> 'b ->  'c) -> 'c
 
+val keepMapInPlaceU: 'a t ->  (key -> 'a -> 'a option [@bs]) -> unit
 val keepMapInPlace: 'a t ->  (key -> 'a -> 'a option) -> unit
 
-
-val size: _ t -> int
+  
+val size: _ t -> int  
 
 
 val toArray: 'a t -> (key * 'a) array
@@ -46,11 +49,3 @@ val logStats: _ t -> unit
 
 val ofArray: (key * 'a) array -> 'a t
 [@@ocaml.deprecated "Use fromArray instead"]
-
-
-(** {1 Uncurried version} *)
-
-
-val forEachU: 'b t -> (key -> 'b -> unit [@bs]) -> unit
-val reduceU: 'b t -> 'c -> ('c -> key -> 'b ->  'c [@bs]) -> 'c
-val keepMapInPlaceU: 'a t ->  (key -> 'a -> 'a option [@bs]) -> unit

jscomp/others/belt_HashMapString.mli

@@ -30,7 +30,7 @@
 
     For example:
     {[
-      type t = int
+      type t = int 
       module I0 =
         (val Belt.Id.hashableU
             ~hash:(fun[\@bs] (a : t)  -> a & 0xff_ff)
@@ -74,7 +74,7 @@
 module Int = Belt_HashSetInt
 
 (** Specalized when key type is [string], more efficient
-    than the gerneic type *)
+    than the gerneic type *)  
 module String = Belt_HashSetString
 
 (* TODO: add a poly module
@@ -83,8 +83,8 @@ module String = Belt_HashSetString
    - generic equal handles JS data structure
    - eq/hash consistent
 *)
-
-type ('a, 'id) t
+  
+type ('a, 'id) t 
 
 (** The type of hash tables from type ['a] to type ['b]. *)
 
@@ -102,31 +102,27 @@ val has: ('a, 'id) t -> 'a -> bool
 
 val remove: ('a, 'id) t -> 'a -> unit
 
+val forEachU: ('a, 'id) t -> ('a  -> unit [@bs]) ->  unit
 val forEach: ('a, 'id) t -> ('a  -> unit) ->  unit
 (** Order unspecified. *)
 
+val reduceU: ('a, 'id) t -> 'c -> ('c -> 'a  ->  'c [@bs]) -> 'c
 val reduce: ('a, 'id) t -> 'c -> ('c -> 'a  ->  'c) -> 'c
 (** Order unspecified. *)
 
-val size: ('a, 'id) t -> int
+val size: ('a, 'id) t -> int  
 
 val logStats: _ t -> unit
 
-val toArray: ('a,'id) t -> 'a array
+val toArray: ('a,'id) t -> 'a array 
 
-val ofArray: 'a array -> id:('a,'id) id -> ('a,'id) t
+val ofArray: 'a array -> id:('a,'id) id -> ('a,'id) t 
 [@@ocaml.deprecated "Use fromArray instead"]
 
-val fromArray: 'a array -> id:('a,'id) id -> ('a,'id) t
+val fromArray: 'a array -> id:('a,'id) id -> ('a,'id) t 
 
 val mergeMany: ('a,'id) t -> 'a array -> unit
 
 val getBucketHistogram: _ t -> int array
 
 
-(** {1 Uncurried version} *)
-
-
-val forEachU: ('a, 'id) t -> ('a  -> unit [@bs]) ->  unit
-
-val reduceU: ('a, 'id) t -> 'c -> ('c -> 'a  ->  'c [@bs]) -> 'c

jscomp/others/belt_HashSet.mli

@@ -1,7 +1,7 @@
 
 # 2 "hashset.cppo.mli"
 (* Copyright (C) 2017 Authors of BuckleScript
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -19,7 +19,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
@@ -40,43 +40,37 @@ type key = int
 # 44 "hashset.cppo.mli"
 type t
 
-val make: hintSize:int -> t
+val make: hintSize:int -> t 
 
 val clear: t -> unit
 
 val isEmpty: t -> bool
-
+  
 val add:  t -> key -> unit
 
 val copy: t -> t
-
+  
 val has: t -> key -> bool
-
+  
 val remove: t -> key -> unit
 
+val forEachU: t -> (key  -> unit [@bs]) ->  unit
 val forEach: t -> (key  -> unit) ->  unit
-
+  
+val reduceU: t -> 'c -> ( 'c -> key -> 'c [@bs]) ->   'c
 val reduce: t -> 'c -> ( 'c -> key -> 'c) ->   'c
-
-val size: t -> int
+  
+val size: t -> int  
 
 val logStats: t -> unit
 
-val toArray: t -> key array
+val toArray: t -> key array 
 
-val ofArray: key array -> t
+val ofArray: key array -> t 
 [@@ocaml.deprecated "Use fromArray instead"]
 
-val fromArray: key array -> t
+val fromArray: key array -> t 
 
 val mergeMany: t -> key array -> unit
 
 val getBucketHistogram: t -> int array
-
-
-(** {1 Uncurried version} *)
-
-
-val forEachU: t -> (key  -> unit [@bs]) ->  unit
-
-val reduceU: t -> 'c -> ( 'c -> key -> 'c [@bs]) ->   'c