remove legacy built-in exceptions

Author: bobzhang

jscomp/ml/predef.ml

@@ -109,33 +109,29 @@ and type_extension_constructor =
 and type_floatarray = newgenty (Tconstr(path_floatarray, [], ref Mnil))
 
 let ident_match_failure = ident_create_predef_exn "Match_failure"
-and ident_out_of_memory = ident_create_predef_exn "Out_of_memory"
+
 and ident_invalid_argument = ident_create_predef_exn "Invalid_argument"
 and ident_failure = ident_create_predef_exn "Failure"
 
 and ident_js_error = ident_create_predef_exn "JsError"
 and ident_not_found = ident_create_predef_exn "Not_found"
-and ident_sys_error = ident_create_predef_exn "Sys_error"
+
 and ident_end_of_file = ident_create_predef_exn "End_of_file"
 and ident_division_by_zero = ident_create_predef_exn "Division_by_zero"
-and ident_stack_overflow = ident_create_predef_exn "Stack_overflow"
-and ident_sys_blocked_io = ident_create_predef_exn "Sys_blocked_io"
+
+
 and ident_assert_failure = ident_create_predef_exn "Assert_failure"
 and ident_undefined_recursive_module =
  ident_create_predef_exn "Undefined_recursive_module"
 
 let all_predef_exns = [
  ident_match_failure;
- ident_out_of_memory;
  ident_invalid_argument;
  ident_failure;
  ident_js_error;
  ident_not_found;
- ident_sys_error;
  ident_end_of_file;
  ident_division_by_zero;
- ident_stack_overflow;
- ident_sys_blocked_io;
  ident_assert_failure;
  ident_undefined_recursive_module;
 ]
@@ -247,14 +243,10 @@ let common_initial_env add_type add_extension empty_env =
  in
  add_extension ident_match_failure
  [newgenty (Ttuple[type_string; type_int; type_int])] (
- add_extension ident_out_of_memory [] (
- add_extension ident_stack_overflow [] (
  add_extension ident_invalid_argument [type_string] (
  add_extension ident_js_error [type_unknown] (
  add_extension ident_failure [type_string] (
  add_extension ident_not_found [] (
- add_extension ident_sys_blocked_io [] (
- add_extension ident_sys_error [type_string] (
  add_extension ident_end_of_file [] (
  add_extension ident_division_by_zero [] (
  add_extension ident_assert_failure
@@ -276,7 +268,7 @@ let common_initial_env add_type add_extension empty_env =
  add_type ident_int decl_abstr_imm (
  add_type ident_extension_constructor decl_abstr (
  add_type ident_floatarray decl_abstr (
- empty_env)))))))))))))))))))))))))))
+ empty_env)))))))))))))))))))))))
 
 let build_initial_env add_type add_exception empty_env =
  let common = common_initial_env add_type add_exception empty_env in
@@ -290,10 +282,10 @@ let build_initial_env add_type add_exception empty_env =
 
 let builtin_values =
  List.map (fun id -> Ident.make_global id; (Ident.name id, id))
- [ident_match_failure; ident_out_of_memory; ident_stack_overflow;
+ [ident_match_failure; 
  ident_invalid_argument;
- ident_failure; ident_js_error; ident_not_found; ident_sys_error; ident_end_of_file;
- ident_division_by_zero; ident_sys_blocked_io;
+ ident_failure; ident_js_error; ident_not_found; ident_end_of_file;
+ ident_division_by_zero; 
  ident_assert_failure; ident_undefined_recursive_module ]
 
 (* Start non-predef identifiers at 1000. This way, more predefs can

jscomp/stdlib-406/printexc.ml

@@ -49,8 +49,6 @@ let to_string x =
  | None -> conv tl)
  | [] ->
  match x with
- | Out_of_memory -> "Out of memory"
- | Stack_overflow -> "Stack overflow"
  | Match_failure(file, line, char) ->
  locfmt file line char (char+5) "Pattern matching failed"
  | Assert_failure(file, line, char) ->

jscomp/test/exn_error_pattern.js

@@ -4,13 +4,19 @@ var Mt = require("./mt.js");
 var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
+var Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Exn_error_pattern.Stack_overflow");
+
+var Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Exn_error_pattern.Sys_blocked_io");
+
+var Sys_error = /* @__PURE__ */Caml_exceptions.create("Exn_error_pattern.Sys_error");
+
 function f(match) {
  if (Caml_exceptions.is_extension(match)) {
  if (match.RE_EXN_ID === "Not_found") {
  return 0;
- } else if (match.RE_EXN_ID === "Invalid_argument" || match.RE_EXN_ID === "Stack_overflow") {
+ } else if (match.RE_EXN_ID === "Invalid_argument" || match.RE_EXN_ID === Stack_overflow) {
  return 1;
- } else if (match.RE_EXN_ID === "Sys_error") {
+ } else if (match.RE_EXN_ID === Sys_error) {
  return 2;
  } else {
  return ;
@@ -27,7 +33,7 @@ function g(match) {
  if (Caml_exceptions.is_extension(match)) {
  if (match.RE_EXN_ID === "Not_found" || match.RE_EXN_ID === "Invalid_argument") {
  return 0;
- } else if (match.RE_EXN_ID === "Sys_error") {
+ } else if (match.RE_EXN_ID === Sys_error) {
  return 2;
  } else if (match.RE_EXN_ID === A || match.RE_EXN_ID === B) {
  return match._1;
@@ -50,21 +56,21 @@ function eq(loc, x, y) {
  Mt.eq_suites(test_id, suites, loc, x, y);
 }
 
-eq("File \"exn_error_pattern.ml\", line 34, characters 5-12", f({
+eq("File \"exn_error_pattern.ml\", line 36, characters 5-12", f({
  RE_EXN_ID: "Not_found"
  }), 0);
 
-eq("File \"exn_error_pattern.ml\", line 35, characters 5-12", f({
+eq("File \"exn_error_pattern.ml\", line 37, characters 5-12", f({
  RE_EXN_ID: "Invalid_argument",
  _1: ""
  }), 1);
 
-eq("File \"exn_error_pattern.ml\", line 36, characters 5-12", f({
- RE_EXN_ID: "Stack_overflow"
+eq("File \"exn_error_pattern.ml\", line 38, characters 5-12", f({
+ RE_EXN_ID: Stack_overflow
  }), 1);
 
-eq("File \"exn_error_pattern.ml\", line 37, characters 5-12", f({
- RE_EXN_ID: "Sys_error",
+eq("File \"exn_error_pattern.ml\", line 39, characters 5-12", f({
+ RE_EXN_ID: Sys_error,
  _1: ""
  }), 2);
 
@@ -77,10 +83,13 @@ catch (raw_e){
  tmp = Caml_js_exceptions.internalToOCamlException(raw_e);
 }
 
-eq("File \"exn_error_pattern.ml\", line 38, characters 5-12", f(tmp), undefined);
+eq("File \"exn_error_pattern.ml\", line 40, characters 5-12", f(tmp), undefined);
 
 Mt.from_pair_suites("Exn_error_pattern", suites.contents);
 
+exports.Stack_overflow = Stack_overflow;
+exports.Sys_blocked_io = Sys_blocked_io;
+exports.Sys_error = Sys_error;
 exports.f = f;
 exports.A = A;
 exports.B = B;

jscomp/test/exn_error_pattern.ml

@@ -1,6 +1,8 @@
 
 
-
+exception Stack_overflow
+exception Sys_blocked_io
+exception Sys_error of string
 
 (*
 let f = [%bs.error? (Not_found | Invalid_argument _)]

jscomp/test/js_promise_basic_test.js

@@ -157,19 +157,21 @@ function orElseRejectedResolveTest(param) {
  return obj$1.catch(fail);
 }
 
+var Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Js_promise_basic_test.Stack_overflow");
+
 function orElseRejectedRejectTest(param) {
  var p = Promise.reject({
  RE_EXN_ID: "Not_found"
  });
  var arg1 = function (param) {
  return Promise.reject({
- RE_EXN_ID: "Stack_overflow"
+ RE_EXN_ID: Stack_overflow
  });
  };
  var obj = p.catch(arg1);
  var obj$1 = obj.then(fail);
  var arg1$1 = function (error) {
- var match = Caml_exceptions.is_extension(error) && error.RE_EXN_ID === "Stack_overflow" ? 0 : undefined;
+ var match = Caml_exceptions.is_extension(error) && error.RE_EXN_ID === Stack_overflow ? 0 : undefined;
  if (match !== undefined) {
  return h;
  }
@@ -407,6 +409,7 @@ exports.orResolvedTest = orResolvedTest;
 exports.orRejectedTest = orRejectedTest;
 exports.orElseResolvedTest = orElseResolvedTest;
 exports.orElseRejectedResolveTest = orElseRejectedResolveTest;
+exports.Stack_overflow = Stack_overflow;
 exports.orElseRejectedRejectTest = orElseRejectedRejectTest;
 exports.resolveTest = resolveTest;
 exports.rejectTest = rejectTest;

jscomp/test/js_promise_basic_test.ml

@@ -66,7 +66,7 @@ let orElseRejectedResolveTest () =
  p |> catch (fun _ -> resolve 22)
  |> then_ (fun value -> resolve @@ assert_bool (value = 22))
  |> catch fail
-
+exception Stack_overflow
 let orElseRejectedRejectTest () =
  let p = reject Not_found in
  p |> catch (fun _ -> reject Stack_overflow)

jscomp/test/test_trywith.js

@@ -1,8 +1,17 @@
 'use strict';
 
 var Curry = require("../../lib/js/curry.js");
+var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
 var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
+var Out_of_memory = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Out_of_memory");
+
+var Sys_error = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_error");
+
+var Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Stack_overflow");
+
+var Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_blocked_io");
+
 function ff(g, x) {
  try {
  Curry._1(g, x);
@@ -19,7 +28,7 @@ function ff(g, x) {
  }
  catch (raw_exn$1){
  var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
- if (exn$1.RE_EXN_ID !== "Out_of_memory") {
+ if (exn$1.RE_EXN_ID !== Out_of_memory) {
  throw exn$1;
  }
 
@@ -29,7 +38,7 @@ function ff(g, x) {
  }
  catch (raw_exn$2){
  var exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
- if (exn$2.RE_EXN_ID !== "Sys_error") {
+ if (exn$2.RE_EXN_ID !== Sys_error) {
  throw exn$2;
  }
 
@@ -69,7 +78,7 @@ function ff(g, x) {
  }
  catch (raw_exn$6){
  var exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6);
- if (exn$6.RE_EXN_ID !== "Stack_overflow") {
+ if (exn$6.RE_EXN_ID !== Stack_overflow) {
  throw exn$6;
  }
 
@@ -79,7 +88,7 @@ function ff(g, x) {
  }
  catch (raw_exn$7){
  var exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7);
- if (exn$7.RE_EXN_ID !== "Sys_blocked_io") {
+ if (exn$7.RE_EXN_ID !== Sys_blocked_io) {
  throw exn$7;
  }
 
@@ -124,7 +133,7 @@ function f(x) {
  RE_EXN_ID: "Assert_failure",
  _1: [
  "test_trywith.ml",
- 51,
+ 55,
  9
  ],
  Error: new Error()
@@ -135,6 +144,10 @@ var u1 = "bad character decimal encoding \\";
 
 var v = "bad character decimal encoding \\%c%c%c";
 
+exports.Out_of_memory = Out_of_memory;
+exports.Sys_error = Sys_error;
+exports.Stack_overflow = Stack_overflow;
+exports.Sys_blocked_io = Sys_blocked_io;
 exports.ff = ff;
 exports.u = u;
 exports.u1 = u1;

jscomp/test/test_trywith.ml

@@ -1,3 +1,7 @@
+exception Out_of_memory
+exception Sys_error of string
+exception Stack_overflow
+exception Sys_blocked_io
 let ff g x =
  (
  try g x 

lib/es6/printexc.js

@@ -44,12 +44,6 @@ function to_string(x) {
  _param = param.tl;
  continue ;
  }
- if (x.RE_EXN_ID === "Out_of_memory") {
- return "Out of memory";
- }
- if (x.RE_EXN_ID === "Stack_overflow") {
- return "Stack overflow";
- }
  if (x.RE_EXN_ID === "Match_failure") {
  var match = x._1;
  var $$char = match[2];

lib/js/printexc.js

@@ -44,12 +44,6 @@ function to_string(x) {
  _param = param.tl;
  continue ;
  }
- if (x.RE_EXN_ID === "Out_of_memory") {
- return "Out of memory";
- }
- if (x.RE_EXN_ID === "Stack_overflow") {
- return "Stack overflow";
- }
  if (x.RE_EXN_ID === "Match_failure") {
  var match = x._1;
  var $$char = match[2];