clean a bit

Author: cometkim

jscomp/core/lam_compile_primitive.ml

@@ -150,8 +150,8 @@ let translate output_prefix loc (cxt : Lam_compile_context.t)
       assert false (* already handled by {!Lam_compile} *)
   | Pstringadd -> (
       match args with [ a; b ] -> E.string_append a b | _ -> assert false)
-  | Pinit_mod -> E.runtime_call Primitive_modules.module_ "init_mod" args
-  | Pupdate_mod -> E.runtime_call Primitive_modules.module_ "update_mod" args
+  | Pinit_mod -> E.runtime_call Primitive_modules.module_ "init" args
+  | Pupdate_mod -> E.runtime_call Primitive_modules.module_ "update" args
   | Psome -> (
       let arg = Ext_list.singleton_exn args in
       match arg.expression_desc with

jscomp/ext/primitive_modules.ml

@@ -53,3 +53,5 @@ let exceptions = "Primitive_exceptions"
 let curry = "Primitive_curry"
 
 let util = "Primitive_util"
+
+let pervasives = "Pervasives"

jscomp/frontend/ast_literal.ml

@@ -49,20 +49,28 @@ module Lid = struct
 
   let type_bool : t = Lident "bool" (* use *predef* *)
 
+  let pervasives : t = Lident Primitive_modules.pervasives
+
+  (* FIXME: Use primitive module *)
   let js_oo : t = Lident "Js_OO"
 
+  (* FIXME: Use primitive module *)
   let js_meth_callback : t = Ldot (js_oo, "Callback")
 
-  let ignore_id : t = Ldot (Lident "Pervasives", "ignore")
+  let ignore_id : t = Ldot (pervasives, "ignore")
 
   let hidden_field n : t = Lident ("I" ^ n)
 
+  (* FIXME: Use primitive module *)
   let js_null : t = Ldot (Lident "Js", "null")
 
+  (* FIXME: Use primitive module *)
   let js_undefined : t = Ldot (Lident "Js", "undefined")
 
+  (* FIXME: Use primitive module *)
   let js_null_undefined : t = Ldot (Lident "Js", "null_undefined")
 
+  (* FIXME: Use primitive module *)
   let js_re_id : t = Ldot (Ldot (Lident "Js", "Re"), "t")
 end
 

jscomp/frontend/ast_literal.mli

@@ -41,6 +41,8 @@ module Lid : sig
 
   val type_bigint : t
 
+  val pervasives : t
+
   val js_oo : t
 
   val js_meth_callback : t

jscomp/runtime/array.res

@@ -2,17 +2,19 @@
 //   This exists for compatibility reason.
 //   Move this into Pervasives or Core
 
-// Note: Array.get/set is implicitly used by `array[idx]` syntax
+// Caution: `Array.get` is implicitly used by `array[idx]` syntax
 external get: (array<'a>, int) => 'a = "%array_safe_get"
+
+// Caution: `Array.set` is implicitly used by `array[idx]` syntax
 external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
 
 // Below is all deprecated and should be removed in v13
 
-let length = Primitive_array_extern.length
+external length: array<'a> => int = "%array_length"
 
-let unsafe_get = Primitive_array_extern.getUnsafe
+external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
 
-let unsafe_set = Primitive_array_extern.setUnsafe
+external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
 
 let init: (int, int => 'a) => array<'a> = %raw(`(length, f) => Array.from({ length }, f)`)
 

jscomp/runtime/array.resi

@@ -12,7 +12,7 @@ external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
 
 /** Return the length (number of elements) of the given array. */
 @deprecated("Use Core instead. This will be removed in v13")
-let length: array<'a> => int
+external length: array<'a> => int = "%array_length"
 
 /** [Array.make n x] returns a fresh array of length [n],
    initialized with [x].
@@ -243,7 +243,7 @@ let stable_sort: (('a, 'a) => int, array<'a>) => unit
 let fast_sort: (('a, 'a) => int, array<'a>) => unit
 
 @deprecated("Use Core instead. This will be removed in v13")
-let unsafe_get: (array<'a>, int) => 'a
+external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
 
 @deprecated("Use Core instead. This will be removed in v13")
-let unsafe_set: (array<'a>, int, 'a) => unit
+external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"

jscomp/runtime/primitive_float_extern.res

@@ -0,0 +1 @@
+external toInt: float => int = "%intoffloat"

jscomp/runtime/primitive_hash.res

@@ -22,12 +22,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+module Float = Primitive_float_extern
 module Obj = Primitive_object_extern
 module Js = Primitive_js_extern
+module String = Primitive_string_extern
 
-external int_of_float: float => int = "%intoffloat"
 @send external charCodeAt: (string, int) => int = "charCodeAt"
-@get external stringLength: string => int = "length"
 
 type rec cell<'a> = {
   content: 'a,
@@ -102,7 +102,7 @@ let hash_final_mix = h => {
 }
 
 let hash_mix_string = (h, s) => {
-  let len = stringLength(s)
+  let len = String.length(s)
   let block = len / 4 - 1
   let hash = ref(h)
   for i in 0 to block {
@@ -136,7 +136,7 @@ let hash_mix_string = (h, s) => {
 let hash = (count: int, _limit, seed: int, obj: Obj.t): int => {
   let s = ref(seed)
   if Js.typeof(obj) == "number" {
-    let u = int_of_float(Obj.magic(obj))
+    let u = Float.toInt(Obj.magic(obj))
     s.contents = hash_mix_int(s.contents, u + u + 1)
     hash_final_mix(s.contents)
   } else if Js.typeof(obj) == "string" {
@@ -155,7 +155,7 @@ let hash = (count: int, _limit, seed: int, obj: Obj.t): int => {
     while !is_empty_queue(queue) && num.contents > 0 {
       let obj = unsafe_pop(queue)
       if Js.typeof(obj) == "number" {
-        let u = int_of_float(Obj.magic(obj))
+        let u = Float.toInt(Obj.magic(obj))
         s.contents = hash_mix_int(s.contents, u + u + 1)
         num.contents = num.contents - 1
       } else if Js.typeof(obj) == "string" {

jscomp/runtime/primitive_int.res

@@ -21,20 +21,16 @@ let max = (x: int, y: int): int =>
     y
   }
 
-external div: (int, int) => int = "%divint"
-
 let div = (x: int, y: int) =>
   if y == 0 {
     raise(Division_by_zero)
   } else {
-    div(x, y)
+    Primitive_int_extern.div(x, y)
   }
 
-external mod_: (int, int) => int = "%modint"
-
 let mod_ = (x: int, y: int) =>
   if y == 0 {
     raise(Division_by_zero)
   } else {
-    mod_(x, y)
+    Primitive_int_extern.mod_(x, y)
   }

jscomp/runtime/primitive_int_extern.res

@@ -0,0 +1,3 @@
+external div: (int, int) => int = "%divint"
+
+external mod_: (int, int) => int = "%modint"

jscomp/runtime/primitive_js_extern.res

@@ -1,70 +1,32 @@
-/**
-  Nullable value of this type can be either null or 'a. This type is equivalent to Js.Null.t.
-*/
 @unboxed
 type null<+'a> = Value('a) | @as(null) Null
 
-/**
-  A value of this type can be either undefined or 'a. This type is equivalent to Js.Undefined.t.
-*/
 type undefined<+'a>
 
 @unboxed type nullable<+'a> = Value('a) | @as(null) Null | @as(undefined) Undefined
 
-/***
-  A value of this type can be undefined, null or 'a. This type is equivalent to Js.Null_undefined.t.
-*/
-
 type null_undefined<+'a> = nullable<'a>
 
-/**
-  The same as empty in `Js.Null`. Compiles to `null`.
-*/
 external null: null<'a> = "%null"
 
-/**
-  The same as empty `Js.Undefined`. Compiles to `undefined`.
-*/
 external undefined: undefined<'a> = "%undefined"
 
 external isNullable: nullable<'a> => bool = "%is_nullable"
 
-/** The same as {!test} except that it is more permissive on the types of input */
 external testAny: 'a => bool = "%is_nullable"
 
-/**
-`typeof x` will be compiled as `typeof x` in JS. Please consider functions in
-`Js.Types` for a type safe way of reflection.
-*/
 external typeof: 'a => string = "%typeof"
 
 external eqNull: ('a, null<'a>) => bool = "%equal_null"
+
 external eqUndefined: ('a, undefined<'a>) => bool = "%equal_undefined"
-external eqNullable: ('a, nullable<'a>) => bool = "%equal_nullable"
 
-/* ## Operators */
+external eqNullable: ('a, nullable<'a>) => bool = "%equal_nullable"
 
-/**
-   `unsafe_lt(a, b)` will be compiled as `a < b`.
-    It is marked as unsafe, since it is impossible
-    to give a proper semantics for comparision which applies to any type
-*/
-external unsafe_lt: ('a, 'a) => bool = "%unsafe_lt"
+external lt: ('a, 'a) => bool = "%unsafe_lt"
 
-/**
-   `unsafe_le(a, b)` will be compiled as `a <= b`.
-   See also `Js.unsafe_lt`.
-*/
-external unsafe_le: ('a, 'a) => bool = "%unsafe_le"
+external le: ('a, 'a) => bool = "%unsafe_le"
 
-/**
-   `unsafe_gt(a, b)` will be compiled as `a > b`.
-    See also `Js.unsafe_lt`.
-*/
-external unsafe_gt: ('a, 'a) => bool = "%unsafe_gt"
+external gt: ('a, 'a) => bool = "%unsafe_gt"
 
-/**
-   `unsafe_ge(a, b)` will be compiled as `a >= b`.
-   See also `Js.unsafe_lt`.
-*/
-external unsafe_ge: ('a, 'a) => bool = "%unsafe_ge"
+external ge: ('a, 'a) => bool = "%unsafe_ge"

jscomp/runtime/primitive_module.res

@@ -18,7 +18,7 @@ module type Empty = {}
     spit out ("CamlinternalMod".[init_mod|update_mod] unless we intercept it 
     in the lambda layer
 */
-let init_mod = (loc: (string, int, int), shape: shape) => {
+let init = (loc: (string, int, int), shape: shape) => {
   let undef_module = _ => raise(Undefined_recursive_module(loc))
   let rec loop = (shape: shape, struct_: Obj.t, idx) =>
     switch shape {
@@ -44,7 +44,7 @@ let init_mod = (loc: (string, int, int), shape: shape) => {
 /* Note the [shape] passed between [init_mod] and [update_mod] is always the same 
    and we assume [module] is encoded as an array
 */
-let update_mod = (shape: shape, o: Obj.t, n: Obj.t): unit => {
+let update = (shape: shape, o: Obj.t, n: Obj.t): unit => {
   let rec aux = (shape: shape, o, n, parent, i) =>
     switch shape {
     | Function => Obj.setField(parent, i, n)

jscomp/runtime/primitive_module.resi

@@ -1,5 +1,7 @@
 external import: 'a => promise<'a> = "%import"
 
 type shape
-let init_mod: ((string, int, int), shape) => Primitive_object.t
-let update_mod: (shape, Primitive_object.t, Primitive_object.t) => unit
+
+let init: ((string, int, int), shape) => Primitive_object.t
+
+let update: (shape, Primitive_object.t, Primitive_object.t) => unit

jscomp/runtime/primitive_object.res

@@ -288,7 +288,7 @@ let rec equal = (a: t, b: t): bool =>
             if O.isArray(a) {
               aux_equal_length((magic(a): array<t>), (magic(b): array<t>), 0, len_a)
             } else if %raw(`a instanceof Date && b instanceof Date`) {
-              !(Js.unsafe_gt(a, b) || Js.unsafe_lt(a, b))
+              !(Js.gt(a, b) || Js.lt(a, b))
             } else {
               aux_obj_equal(a, b)
             }