Merge pull request #1014 from bloomberg/exception_less

exception less api

Author: bobzhang

jscomp/all.depend

@@ -370,9 +370,9 @@ core/lam_compile_const.cmx : core/lam_compile_util.cmx \
 core/lam_inner.cmx : core/lam.cmx core/lam_inner.cmi
 core/lam_util.cmx : ext/literals.cmx core/lam_stats.cmx core/lam_print.cmx \
     core/lam_module_ident.cmx core/lam_analysis.cmx core/lam.cmx \
-    core/js_fold_basic.cmx common/js_config.cmx ext/ident_set.cmx \
-    ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
-    ext/ext_filename.cmx core/lam_util.cmi
+    common/js_config.cmx ext/ident_set.cmx ext/ident_map.cmx \
+    ext/ident_hashtbl.cmx ext/ext_list.cmx ext/ext_filename.cmx \
+    core/lam_util.cmi
 core/lam_group.cmx : core/lam_util.cmx core/lam_print.cmx core/lam.cmx \
     core/js_number.cmx ext/ident_set.cmx core/lam_group.cmi
 core/js_stmt_make.cmx : core/lam_util.cmx core/lam.cmx core/js_exp_make.cmx \

jscomp/bin/all_ounit_tests.ml

@@ -4706,7 +4706,8 @@ module type S =
     val find_exn: key -> 'a t -> 'a
     (** [find x m] returns the current binding of [x] in [m],
        or raises [Not_found] if no such binding exists. *)
-
+    val find_opt: key -> 'a t -> 'a option
+    val find_default: key  -> 'a t -> 'a  -> 'a 
     val map: ('a -> 'b) -> 'a t -> 'b t
     (** [map f m] returns a map with same domain as [m], where the
        associated value [a] of all bindings of [m] has been
@@ -4811,6 +4812,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false
@@ -6388,6 +6403,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false

jscomp/bin/bsb.ml

@@ -1738,7 +1738,8 @@ module type S =
     val find_exn: key -> 'a t -> 'a
     (** [find x m] returns the current binding of [x] in [m],
        or raises [Not_found] if no such binding exists. *)
-
+    val find_opt: key -> 'a t -> 'a option
+    val find_default: key  -> 'a t -> 'a  -> 'a 
     val map: ('a -> 'b) -> 'a t -> 'b t
     (** [map f m] returns a map with same domain as [m], where the
        associated value [a] of all bindings of [m] has been
@@ -1843,6 +1844,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false

jscomp/bin/bsb_helper.ml

@@ -1704,7 +1704,8 @@ module type S =
     val find_exn: key -> 'a t -> 'a
     (** [find x m] returns the current binding of [x] in [m],
        or raises [Not_found] if no such binding exists. *)
-
+    val find_opt: key -> 'a t -> 'a option
+    val find_default: key  -> 'a t -> 'a  -> 'a 
     val map: ('a -> 'b) -> 'a t -> 'b t
     (** [map f m] returns a map with same domain as [m], where the
        associated value [a] of all bindings of [m] has been
@@ -1809,6 +1810,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false

jscomp/bin/bsdep.ml

@@ -22559,7 +22559,8 @@ module type S =
     val find_exn: key -> 'a t -> 'a
     (** [find x m] returns the current binding of [x] in [m],
        or raises [Not_found] if no such binding exists. *)
-
+    val find_opt: key -> 'a t -> 'a option
+    val find_default: key  -> 'a t -> 'a  -> 'a 
     val map: ('a -> 'b) -> 'a t -> 'b t
     (** [map f m] returns a map with same domain as [m], where the
        associated value [a] of all bindings of [m] has been
@@ -22664,6 +22665,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false

jscomp/bin/bsppx.ml

@@ -4417,7 +4417,8 @@ module type S =
     val find_exn: key -> 'a t -> 'a
     (** [find x m] returns the current binding of [x] in [m],
        or raises [Not_found] if no such binding exists. *)
-
+    val find_opt: key -> 'a t -> 'a option
+    val find_default: key  -> 'a t -> 'a  -> 'a 
     val map: ('a -> 'b) -> 'a t -> 'b t
     (** [map f m] returns a map with same domain as [m], where the
        associated value [a] of all bindings of [m] has been
@@ -4522,6 +4523,20 @@ let rec find_exn x (tree : _ Map_gen.t )  = match tree with
     if c = 0 then d
     else find_exn x (if c < 0 then l else r)
 
+let rec find_opt x (tree : _ Map_gen.t )  = match tree with 
+  | Empty -> None 
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then Some d
+    else find_opt x (if c < 0 then l else r)
+
+let rec find_default x (tree : _ Map_gen.t ) default     = match tree with 
+  | Empty -> default  
+  | Node(l, v, d, r, _) ->
+    let c = compare_key x v in
+    if c = 0 then  d
+    else find_default x   (if c < 0 then l else r) default
+
 let rec mem x (tree : _ Map_gen.t )   = match tree with 
   | Empty ->
     false

jscomp/bin/whole_compiler.d

@@ -198,14 +198,10 @@ bin/whole_compiler.ml : core/config_util.ml
 bin/whole_compiler.ml : core/config_util.mli
 bin/whole_compiler.ml : ext/ident_hashtbl.ml
 bin/whole_compiler.ml : ext/ident_hashtbl.mli
-bin/whole_compiler.ml : ext/hash_set_poly.ml
-bin/whole_compiler.ml : ext/hash_set_poly.mli
-bin/whole_compiler.ml : core/lam_module_ident.ml
-bin/whole_compiler.ml : core/lam_module_ident.mli
-bin/whole_compiler.ml : core/js_fold_basic.ml
-bin/whole_compiler.ml : core/js_fold_basic.mli
 bin/whole_compiler.ml : core/lam_analysis.ml
 bin/whole_compiler.ml : core/lam_analysis.mli
+bin/whole_compiler.ml : core/lam_module_ident.ml
+bin/whole_compiler.ml : core/lam_module_ident.mli
 bin/whole_compiler.ml : core/lam_print.ml
 bin/whole_compiler.ml : core/lam_print.mli
 bin/whole_compiler.ml : ext/int_hash_set.ml
@@ -216,6 +212,8 @@ bin/whole_compiler.ml : core/lam_util.ml
 bin/whole_compiler.ml : core/lam_util.mli
 bin/whole_compiler.ml : core/js_stmt_make.ml
 bin/whole_compiler.ml : core/js_stmt_make.mli
+bin/whole_compiler.ml : ext/hash_set_poly.ml
+bin/whole_compiler.ml : ext/hash_set_poly.mli
 bin/whole_compiler.ml : core/type_int_to_string.ml
 bin/whole_compiler.ml : core/type_util.ml
 bin/whole_compiler.ml : core/type_util.mli
@@ -225,6 +223,8 @@ bin/whole_compiler.ml : core/js_program_loader.ml
 bin/whole_compiler.ml : core/js_program_loader.mli
 bin/whole_compiler.ml : core/js_dump.ml
 bin/whole_compiler.ml : core/js_dump.mli
+bin/whole_compiler.ml : core/js_fold_basic.ml
+bin/whole_compiler.ml : core/js_fold_basic.mli
 bin/whole_compiler.ml : core/lam_compile_defs.ml
 bin/whole_compiler.ml : core/lam_compile_defs.mli
 bin/whole_compiler.ml : core/js_output.ml