better naming for caml_option

Author: bobzhang

jscomp/core/js_dump.ml

@@ -827,7 +827,7 @@ and expression_desc cxt (level:int) f x : cxt  =
     expression level cxt f  
       (if identity then e 
        else       
-         E.runtime_call Js_runtime_modules.js_primitive "some" [e])
+         E.runtime_call Js_runtime_modules.option "some" [e])
   | Caml_block( el, mutable_flag, tag, tag_info)
     ->
     (* Note that, if we ignore more than tag [0] we loose some information

jscomp/core/js_fold_basic.ml

@@ -132,7 +132,7 @@ class count_hard_dependencies =
       | {expression_desc = Optional_block (_,false)} ->   
         add_lam_module_ident hard_dependencies
         (Lam_module_ident.of_runtime 
-          (Ident.create_persistent Js_runtime_modules.js_primitive))
+          (Ident.create_persistent Js_runtime_modules.option))
         ;
         super#expression x
       | _ -> super#expression x

jscomp/core/js_of_lam_option.ml

@@ -59,7 +59,7 @@ let val_from_option (arg : J.expression) =
   match arg.expression_desc with 
   | Optional_block (x,_) -> x 
   | _ -> 
-    E.runtime_call Js_runtime_modules.js_primitive
+    E.runtime_call Js_runtime_modules.option
       "valFromOption" [arg]
 (**
   Invrariant: 
@@ -91,7 +91,7 @@ let get_default_undefined_from_optional
       E.econd (is_not_none arg )
         (val_from_option arg) E.undefined
     else
-      (E.runtime_call Js_runtime_modules.js_primitive "option_get" [arg])
+      (E.runtime_call Js_runtime_modules.option "option_get" [arg])
 
 let get_default_undefined (arg : J.expression) : J.expression =
   let desc = arg.expression_desc in
@@ -107,7 +107,7 @@ let get_default_undefined (arg : J.expression) : J.expression =
       E.econd (is_not_none arg) 
         (Js_of_lam_polyvar.get_field (val_from_option arg)) E.undefined
     else
-      E.runtime_call Js_runtime_modules.js_primitive "option_get_unwrap" [arg]
+      E.runtime_call Js_runtime_modules.option "option_get_unwrap" [arg]
 
 let destruct_optional
   ~for_sure_none

jscomp/core/js_runtime_modules.ml

@@ -48,7 +48,7 @@ let weak = "Caml_weak"
 let gc = "Caml_gc"
 let int32 = "Caml_int32"
 let block = "Block"
-let js_primitive = "Js_primitive"
+let option = "Caml_option"
 let module_ = "Caml_module"
 let missing_polyfill = "Caml_missing_polyfill"
 let caml_js_exceptions = "Caml_js_exceptions"

jscomp/core/lam_compile_primitive.ml

@@ -76,7 +76,7 @@ let translate  loc
         | Var _ | Undefined | Null -> 
           Js_of_lam_option.null_to_opt e 
         | _ ->
-          E.runtime_call Js_runtime_modules.js_primitive
+          E.runtime_call Js_runtime_modules.option
             "null_to_opt" args)         
      | _ -> assert false )
 
@@ -87,7 +87,7 @@ let translate  loc
         | Var _ | Undefined | Null -> 
           Js_of_lam_option.undef_to_opt e 
         | _ -> 
-          E.runtime_call Js_runtime_modules.js_primitive  
+          E.runtime_call Js_runtime_modules.option  
             "undefined_to_opt" args )
      | _ -> assert false )
 
@@ -99,7 +99,7 @@ let translate  loc
             Js_of_lam_option.null_undef_to_opt e             
           | _ ->
             E.runtime_call 
-              Js_runtime_modules.js_primitive        
+              Js_runtime_modules.option        
               "nullable_to_opt" args 
         end
       | _ -> assert false  

jscomp/runtime/.depend

@@ -10,18 +10,20 @@ caml_hash.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj
 caml_hash_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_int32.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_int64.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_io.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_lexer.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_md5.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_missing_polyfill.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_module.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj
 caml_obj.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj
 caml_oo.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
+caml_option.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_undefined_extern.cmj caml_obj_extern.cmj
 caml_parser.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj
 caml_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_string.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_sys.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_utils.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_weak.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-js_primitive.cmi : js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_undefined_extern.cmj caml_obj_extern.cmj
 block.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj block.cmi
 caml_array.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_array.cmi caml_array_extern.cmj
 caml_array_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
@@ -40,27 +42,27 @@ caml_int32.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin
 caml_int32_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_int64.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_int32.cmj caml_utils.cmj caml_primitive.cmj caml_builtin_exceptions.cmj caml_int64.cmi caml_string_extern.cmj caml_nativeint_extern.cmj caml_float_extern.cmj caml_float.cmj caml_char.cmj
 caml_int64_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
-caml_io.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe curry.cmj caml_builtin_exceptions.cmj caml_undefined_extern.cmj caml_string_extern.cmj caml_io.cmi
-caml_js_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe js_primitive.cmj caml_exceptions.cmj caml_obj_extern.cmj
+caml_io.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe curry.cmj caml_io.cmi caml_undefined_extern.cmj caml_string_extern.cmj
+caml_js_exceptions.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_option.cmj caml_exceptions.cmj caml_obj_extern.cmj
 caml_lexer.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_lexer.cmi
 caml_md5.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_string_extern.cmj caml_int32_extern.cmj caml_char.cmj caml_array_extern.cmj caml_md5.cmi
 caml_missing_polyfill.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_missing_polyfill.cmi
-caml_module.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_builtin_exceptions.cmj caml_obj_extern.cmj caml_array_extern.cmj caml_module.cmi
+caml_module.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_builtin_exceptions.cmj caml_module.cmi caml_obj_extern.cmj caml_array_extern.cmj
 caml_nativeint_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_obj.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe block.cmj caml_primitive.cmj caml_builtin_exceptions.cmj caml_obj.cmi caml_obj_extern.cmj caml_array_extern.cmj
 caml_obj_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_oo.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_array.cmj caml_builtin_exceptions.cmj caml_oo.cmi caml_obj_extern.cmj caml_array_extern.cmj
 caml_oo_curry.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe curry.cmj caml_oo.cmj
+caml_option.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_undefined_extern.cmj caml_obj_extern.cmj caml_option.cmi
 caml_parser.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj_extern.cmj caml_parser.cmi
 caml_primitive.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_bytes_extern.cmj caml_primitive.cmi
 caml_string.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_string.cmi caml_string_extern.cmj caml_char.cmj
 caml_string_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_sys.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_builtin_exceptions.cmj caml_sys.cmi caml_undefined_extern.cmj caml_nativeint_extern.cmj caml_array_extern.cmj
 caml_undefined_extern.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe
 caml_utils.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_utils.cmi
-caml_weak.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_array.cmj js_primitive.cmj caml_weak.cmi caml_undefined_extern.cmj caml_obj_extern.cmj caml_array_extern.cmj
+caml_weak.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_obj.cmj caml_array.cmj caml_option.cmj caml_weak.cmi caml_undefined_extern.cmj caml_obj_extern.cmj caml_array_extern.cmj
 curry.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_array.cmj caml_array_extern.cmj
-js_primitive.cmj : js.cmj js.cmi bs_stdlib_mini.cmi ../../lib/bsc.exe caml_undefined_extern.cmj caml_obj_extern.cmj js_primitive.cmi
-all : block.cmi caml_array.cmi caml_builtin_exceptions.cmi caml_bytes.cmi caml_exceptions.cmi caml_float.cmi caml_format.cmi caml_gc.cmi caml_hash.cmi caml_hash_primitive.cmi caml_int32.cmi caml_int64.cmi caml_lexer.cmi caml_md5.cmi caml_missing_polyfill.cmi caml_obj.cmi caml_oo.cmi caml_parser.cmi caml_primitive.cmi caml_string.cmi caml_sys.cmi caml_utils.cmi caml_weak.cmi js_primitive.cmi block.cmj caml_array.cmj caml_array_extern.cmj caml_builtin_exceptions.cmj caml_bytes.cmj caml_bytes_extern.cmj caml_char.cmj caml_exceptions.cmj caml_float.cmj caml_float_extern.cmj caml_format.cmj caml_gc.cmj caml_hash.cmj caml_hash_primitive.cmj caml_int32.cmj caml_int32_extern.cmj caml_int64.cmj caml_int64_extern.cmj caml_io.cmj caml_js_exceptions.cmj caml_lexer.cmj caml_md5.cmj caml_missing_polyfill.cmj caml_module.cmj caml_nativeint_extern.cmj caml_obj.cmj caml_obj_extern.cmj caml_oo.cmj caml_oo_curry.cmj caml_parser.cmj caml_primitive.cmj caml_string.cmj caml_string_extern.cmj caml_sys.cmj caml_undefined_extern.cmj caml_utils.cmj caml_weak.cmj curry.cmj js_primitive.cmj js.cmj js.cmi
+all : block.cmi caml_array.cmi caml_builtin_exceptions.cmi caml_bytes.cmi caml_exceptions.cmi caml_float.cmi caml_format.cmi caml_gc.cmi caml_hash.cmi caml_hash_primitive.cmi caml_int32.cmi caml_int64.cmi caml_io.cmi caml_lexer.cmi caml_md5.cmi caml_missing_polyfill.cmi caml_module.cmi caml_obj.cmi caml_oo.cmi caml_option.cmi caml_parser.cmi caml_primitive.cmi caml_string.cmi caml_sys.cmi caml_utils.cmi caml_weak.cmi block.cmj caml_array.cmj caml_array_extern.cmj caml_builtin_exceptions.cmj caml_bytes.cmj caml_bytes_extern.cmj caml_char.cmj caml_exceptions.cmj caml_float.cmj caml_float_extern.cmj caml_format.cmj caml_gc.cmj caml_hash.cmj caml_hash_primitive.cmj caml_int32.cmj caml_int32_extern.cmj caml_int64.cmj caml_int64_extern.cmj caml_io.cmj caml_js_exceptions.cmj caml_lexer.cmj caml_md5.cmj caml_missing_polyfill.cmj caml_module.cmj caml_nativeint_extern.cmj caml_obj.cmj caml_obj_extern.cmj caml_oo.cmj caml_oo_curry.cmj caml_option.cmj caml_parser.cmj caml_primitive.cmj caml_string.cmj caml_string_extern.cmj caml_sys.cmj caml_undefined_extern.cmj caml_utils.cmj caml_weak.cmj curry.cmj js.cmj js.cmi
 js.cmj : ../../lib/bsc.exe js.cmi
 js.cmi : ../../lib/bsc.exe bs_stdlib_mini.cmi

jscomp/runtime/js_primitive.ml jscomp/runtime/caml_option.ml

@@ -1,6 +1,6 @@
 'use strict';
 
-var Js_primitive = require("../../lib/js/js_primitive.js");
+var Caml_option = require("../../lib/js/caml_option.js");
 var Js_undefined = require("../../lib/js/js_undefined.js");
 var Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js");
 var Belt_MutableStack = require("../../lib/js/belt_MutableStack.js");
@@ -86,7 +86,7 @@ function n(l, r, a) {
         };
 }
 
-var test1 = n(Js_primitive.some(n(Js_primitive.some(n(undefined, undefined, 4)), Js_primitive.some(n(undefined, undefined, 5)), 2)), Js_primitive.some(n(undefined, undefined, 3)), 1);
+var test1 = n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), Caml_option.some(n(undefined, undefined, 5)), 2)), Caml_option.some(n(undefined, undefined, 3)), 1);
 
 function pushAllLeft(st1, s1) {
   var current = st1;
@@ -98,9 +98,9 @@ function pushAllLeft(st1, s1) {
   return /* () */0;
 }
 
-var test2 = n(Js_primitive.some(n(Js_primitive.some(n(Js_primitive.some(n(Js_primitive.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), undefined, 1)), undefined, 3);
+var test2 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), undefined, 1)), undefined, 3);
 
-var test3 = n(Js_primitive.some(n(Js_primitive.some(n(Js_primitive.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), Js_primitive.some(n(undefined, undefined, 3)), 1);
+var test3 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), Caml_option.some(n(undefined, undefined, 3)), 1);
 
 console.log(inOrder(test1));
 

jscomp/runtime/js_primitive.mli jscomp/runtime/caml_option.mli

@@ -1,7 +1,7 @@
 'use strict';
 
 var Curry = require("../../lib/js/curry.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
+var Caml_option = require("../../lib/js/caml_option.js");
 
 console.log(/* tuple */[
       "hello world",
@@ -44,14 +44,14 @@ var some_arg = /* `Bool */[
   true
 ];
 
-console.log(5, some_arg !== undefined ? Js_primitive.valFromOption(some_arg)[1] : undefined);
+console.log(5, some_arg !== undefined ? Caml_option.valFromOption(some_arg)[1] : undefined);
 
 console.log(6, undefined);
 
-console.log(7, Js_primitive.option_get_unwrap((console.log("trace"), undefined)));
+console.log(7, Caml_option.option_get_unwrap((console.log("trace"), undefined)));
 
 function dyn_log3(prim, prim$1, prim$2) {
-  console.log(prim[1], prim$1 !== undefined ? Js_primitive.valFromOption(prim$1)[1] : undefined);
+  console.log(prim[1], prim$1 !== undefined ? Caml_option.valFromOption(prim$1)[1] : undefined);
   return /* () */0;
 }
 
@@ -84,12 +84,12 @@ function f(x) {
 }
 
 function ff0(x, p) {
-  console.log(x !== undefined ? Js_primitive.valFromOption(x)[1] : undefined, p);
+  console.log(x !== undefined ? Caml_option.valFromOption(x)[1] : undefined, p);
   return /* () */0;
 }
 
 function ff1(x, p) {
-  console.log(Js_primitive.option_get_unwrap(Curry._1(x, /* () */0)), p);
+  console.log(Caml_option.option_get_unwrap(Curry._1(x, /* () */0)), p);
   return /* () */0;
 }
 

jscomp/test/bs_stack_test.js

@@ -5,7 +5,7 @@ var Oo = require("../../lib/js/oo.js");
 var Block = require("../../lib/js/block.js");
 var Curry = require("../../lib/js/curry.js");
 var Caml_obj = require("../../lib/js/caml_obj.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
+var Caml_option = require("../../lib/js/caml_option.js");
 var Caml_oo_curry = require("../../lib/js/caml_oo_curry.js");
 var CamlinternalOO = require("../../lib/js/camlinternalOO.js");
 var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
@@ -134,14 +134,14 @@ function backup_init($$class) {
         save,
         (function (self$3) {
             var copy$1 = Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(self$3));
-            self$3[copy] = Js_primitive.some((copy$1[copy] = undefined, copy$1));
+            self$3[copy] = Caml_option.some((copy$1[copy] = undefined, copy$1));
             return /* () */0;
           }),
         restore,
         (function (self$3) {
             var match = self$3[copy];
             if (match !== undefined) {
-              return Js_primitive.valFromOption(match);
+              return Caml_option.valFromOption(match);
             } else {
               return self$3;
             }
@@ -232,14 +232,14 @@ function backup2_init($$class) {
   CamlinternalOO.set_methods($$class, /* array */[
         save,
         (function (self$5) {
-            self$5[copy] = Js_primitive.some(Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(self$5)));
+            self$5[copy] = Caml_option.some(Caml_exceptions.caml_set_oo_id(Caml_obj.caml_obj_dup(self$5)));
             return /* () */0;
           }),
         restore,
         (function (self$5) {
             var match = self$5[copy];
             if (match !== undefined) {
-              return Js_primitive.valFromOption(match);
+              return Caml_option.valFromOption(match);
             } else {
               return self$5;
             }

jscomp/test/bs_unwrap_test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var Js_exn = require("../../lib/js/js_exn.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
+var Caml_option = require("../../lib/js/caml_option.js");
 var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
 
 function test_js_error(param) {
@@ -21,7 +21,7 @@ function test_js_error(param) {
     }
   }
   if (exit === 1) {
-    return Js_primitive.some(e);
+    return Caml_option.some(e);
   }
 
 }
@@ -58,14 +58,14 @@ function example1(param) {
     }
   }
   if (exit === 1) {
-    return Js_primitive.some(v);
+    return Caml_option.some(v);
   }
 
 }
 
 function example2(param) {
   try {
-    return Js_primitive.some(JSON.parse(" {\"x\"}"));
+    return Caml_option.some(JSON.parse(" {\"x\"}"));
   }
   catch (raw_exn){
     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);

jscomp/test/class7_test.js

@@ -4,7 +4,7 @@ var List = require("../../lib/js/list.js");
 var $$Array = require("../../lib/js/array.js");
 var Curry = require("../../lib/js/curry.js");
 var Caml_array = require("../../lib/js/caml_array.js");
-var Js_primitive = require("../../lib/js/js_primitive.js");
+var Caml_option = require("../../lib/js/caml_option.js");
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions.js");
 
 function reverse_range(a, i, len) {
@@ -101,7 +101,7 @@ function filter_map(f, a) {
       _i = i + 1 | 0;
       if (match !== undefined) {
         _acc = /* :: */[
-          Js_primitive.valFromOption(match),
+          Caml_option.valFromOption(match),
           acc
         ];
         continue ;
@@ -149,7 +149,7 @@ function tolist_aux(a, f, _i, _res) {
       var v = a[i];
       var match = Curry._1(f, v);
       _res = match !== undefined ? /* :: */[
-          Js_primitive.valFromOption(match),
+          Caml_option.valFromOption(match),
           res
         ] : res;
       _i = i - 1 | 0;