Stdlib namespace for Core modules

Author: cknitt

compiler/core/res_compmisc.ml

@@ -54,7 +54,10 @@ let initial_env ?modulename () =
   let initial = Env.initial_safe_string in
   let env =
     if !Clflags.nopervasives then initial
-    else open_implicit_module "Pervasives" initial
+    else
+      initial
+      |> open_implicit_module "Pervasives"
+      |> open_implicit_module "Stdlib"
   in
   List.fold_left
     (fun env m -> open_implicit_module m env)

compiler/ml/ast_untagged_variants.ml

@@ -179,8 +179,8 @@ let type_to_instanceof_backed_obj (t : Types.type_expr) =
   | Tconstr (path, _, _) when Path.same path Predef.path_array -> Some Array
   | Tconstr (path, _, _) -> (
     match Path.name path with
-    | "Js_date.t" -> Some Date
-    | "Js_re.t" -> Some RegExp
+    | "Stdlib_Date.t" -> Some Date
+    | "Stdlib_RegExp.t" -> Some RegExp
     | "Js_file.t" -> Some File
     | "Js_blob.t" -> Some Blob
     | _ -> None)

lib/es6/Pervasives.js

@@ -1,7 +1,5 @@
 
 
-import * as $$Error from "./Error.js";
-import * as Primitive_object from "./Primitive_object.js";
 import * as Primitive_exceptions from "./Primitive_exceptions.js";
 
 function failwith(s) {
@@ -117,21 +115,6 @@ function $at(l1, l2) {
   }
 }
 
-function assertEqual(a, b) {
-  if (!Primitive_object.notequal(a, b)) {
-    return;
-  }
-  throw {
-    RE_EXN_ID: "Assert_failure",
-    _1: [
-      "Pervasives.res",
-      596,
-      4
-    ],
-    Error: new Error()
-  };
-}
-
 let max_int = 2147483647;
 
 let infinity = Infinity;
@@ -144,8 +127,6 @@ let min_float = 2.22507385850720138e-308;
 
 let epsilon_float = 2.22044604925031308e-16;
 
-let panic = $$Error.panic;
-
 export {
   failwith,
   invalid_arg,
@@ -166,7 +147,5 @@ export {
   bool_of_string_opt,
   int_of_string_opt,
   $at,
-  panic,
-  assertEqual,
 }
 /* No side effect */

lib/es6/Stdlib.js

@@ -0,0 +1,159 @@
+
+
+import * as Stdlib_Error from "./Stdlib_Error.js";
+import * as Primitive_object from "./Primitive_object.js";
+
+function assertEqual(a, b) {
+  if (!Primitive_object.notequal(a, b)) {
+    return;
+  }
+  throw {
+    RE_EXN_ID: "Assert_failure",
+    _1: [
+      "Stdlib.res",
+      117,
+      4
+    ],
+    Error: new Error()
+  };
+}
+
+let $$Array;
+
+let $$BigInt;
+
+let Console;
+
+let $$DataView;
+
+let $$Date;
+
+let Dict;
+
+let Exn;
+
+let $$Error;
+
+let Float;
+
+let Int;
+
+let $$Intl;
+
+let $$JSON;
+
+let List;
+
+let $$Math;
+
+let Null;
+
+let Nullable;
+
+let $$Object;
+
+let Option;
+
+let Ordering;
+
+let $$Promise;
+
+let $$RegExp;
+
+let Result;
+
+let $$String;
+
+let $$Symbol;
+
+let Type;
+
+let $$Iterator;
+
+let $$AsyncIterator;
+
+let $$Map;
+
+let $$WeakMap;
+
+let $$Set;
+
+let $$WeakSet;
+
+let $$ArrayBuffer;
+
+let $$TypedArray;
+
+let $$Float32Array;
+
+let $$Float64Array;
+
+let $$Int8Array;
+
+let $$Int16Array;
+
+let $$Int32Array;
+
+let $$Uint8Array;
+
+let $$Uint16Array;
+
+let $$Uint32Array;
+
+let $$Uint8ClampedArray;
+
+let $$BigInt64Array;
+
+let $$BigUint64Array;
+
+let panic = Stdlib_Error.panic;
+
+export {
+  $$Array,
+  $$BigInt,
+  Console,
+  $$DataView,
+  $$Date,
+  Dict,
+  Exn,
+  $$Error,
+  Float,
+  Int,
+  $$Intl,
+  $$JSON,
+  List,
+  $$Math,
+  Null,
+  Nullable,
+  $$Object,
+  Option,
+  Ordering,
+  $$Promise,
+  $$RegExp,
+  Result,
+  $$String,
+  $$Symbol,
+  Type,
+  $$Iterator,
+  $$AsyncIterator,
+  $$Map,
+  $$WeakMap,
+  $$Set,
+  $$WeakSet,
+  $$ArrayBuffer,
+  $$TypedArray,
+  $$Float32Array,
+  $$Float64Array,
+  $$Int8Array,
+  $$Int16Array,
+  $$Int32Array,
+  $$Uint8Array,
+  $$Uint16Array,
+  $$Uint32Array,
+  $$Uint8ClampedArray,
+  $$BigInt64Array,
+  $$BigUint64Array,
+  panic,
+  assertEqual,
+}
+/* No side effect */

lib/es6/Array.js lib/es6/Stdlib_Array.js

@@ -1,6 +1,6 @@
 
 
-import * as $$Array from "./Array.js";
+import * as Stdlib_Array from "./Stdlib_Array.js";
 
 function fromString(x, radix) {
   let maybeInt = radix !== undefined ? parseInt(x, radix) : parseInt(x);
@@ -46,7 +46,7 @@ function range(start, end, optionsOpt) {
     let range$2 = options.inclusive === true ? range$1 + 1 | 0 : range$1;
     length = Math.ceil(range$2 / abs(step)) | 0;
   }
-  return $$Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
+  return Stdlib_Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
 }
 
 function rangeWithOptions(start, end, options) {

lib/es6/ArrayBuffer.js lib/es6/Stdlib_ArrayBuffer.js

@@ -1,9 +1,9 @@
 
 
-import * as Type from "./Type.js";
+import * as Stdlib_Type from "./Stdlib_Type.js";
 
 function parseJsValue(value) {
-  let value$1 = Type.Classify.classify(value);
+  let value$1 = Stdlib_Type.Classify.classify(value);
   if (typeof value$1 !== "object") {
     return;
   }

lib/es6/AsyncIterator.js lib/es6/Stdlib_AsyncIterator.js

@@ -1,6 +1,6 @@
 
 
-import * as $$Array from "./Array.js";
+import * as Stdlib_Array from "./Stdlib_Array.js";
 import * as Primitive_int from "./Primitive_int.js";
 import * as Primitive_option from "./Primitive_option.js";
 
@@ -648,7 +648,7 @@ function toArray(x) {
 
 function toShuffled(xs) {
   let v = toArray(xs);
-  $$Array.shuffle(v);
+  Stdlib_Array.shuffle(v);
   return fromArray(v);
 }
 

lib/es6/BigInt.js lib/es6/Stdlib_BigInt.js

@@ -1,6 +1,6 @@
 
 
-import * as Option from "./Option.js";
+import * as Stdlib_Option from "./Stdlib_Option.js";
 import * as Primitive_option from "./Primitive_option.js";
 
 function fromOption(option) {
@@ -12,11 +12,11 @@ function fromOption(option) {
 }
 
 function equal(a, b, eq) {
-  return Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
+  return Stdlib_Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
 }
 
 function compare(a, b, cmp) {
-  return Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
+  return Stdlib_Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
 }
 
 function getOr(value, $$default) {

lib/es6/BigInt64Array.js lib/es6/Stdlib_BigInt64Array.js

@@ -1,6 +1,6 @@
 
 
-import * as Option from "./Option.js";
+import * as Stdlib_Option from "./Stdlib_Option.js";
 import * as Primitive_option from "./Primitive_option.js";
 
 function fromOption(option) {
@@ -11,11 +11,11 @@ function fromOption(option) {
 }
 
 function equal(a, b, eq) {
-  return Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
+  return Stdlib_Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
 }
 
 function compare(a, b, cmp) {
-  return Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
+  return Stdlib_Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
 }
 
 function getOr(value, $$default) {

lib/es6/BigUint64Array.js lib/es6/Stdlib_BigUint64Array.js

@@ -1,6 +1,6 @@
 
 
-import * as $$Error from "./Error.js";
+import * as Stdlib_Error from "./Stdlib_Error.js";
 import * as Primitive_option from "./Primitive_option.js";
 
 function filter(opt, p) {
@@ -21,7 +21,7 @@ function getExn(x, message) {
   if (x !== undefined) {
     return Primitive_option.valFromOption(x);
   } else {
-    return $$Error.panic(message !== undefined ? message : "Option.getExn called for None value");
+    return Stdlib_Error.panic(message !== undefined ? message : "Option.getExn called for None value");
   }
 }
 

lib/es6/Console.js lib/es6/Stdlib_Console.js

@@ -1,7 +1,5 @@
 'use strict';
 
-let $$Error = require("./Error.js");
-let Primitive_object = require("./Primitive_object.js");
 let Primitive_exceptions = require("./Primitive_exceptions.js");
 
 function failwith(s) {
@@ -117,21 +115,6 @@ function $at(l1, l2) {
   }
 }
 
-function assertEqual(a, b) {
-  if (!Primitive_object.notequal(a, b)) {
-    return;
-  }
-  throw {
-    RE_EXN_ID: "Assert_failure",
-    _1: [
-      "Pervasives.res",
-      596,
-      4
-    ],
-    Error: new Error()
-  };
-}
-
 let max_int = 2147483647;
 
 let infinity = Infinity;
@@ -144,8 +127,6 @@ let min_float = 2.22507385850720138e-308;
 
 let epsilon_float = 2.22044604925031308e-16;
 
-let panic = $$Error.panic;
-
 exports.failwith = failwith;
 exports.invalid_arg = invalid_arg;
 exports.Exit = Exit;
@@ -165,6 +146,4 @@ exports.bool_of_string = bool_of_string;
 exports.bool_of_string_opt = bool_of_string_opt;
 exports.int_of_string_opt = int_of_string_opt;
 exports.$at = $at;
-exports.panic = panic;
-exports.assertEqual = assertEqual;
 /* No side effect */