caml_is_js is not needed

Either we use #if BS macro or use Sys.backend_type in the future

Author: bobzhang

jscomp/core/lam_analysis.ml

@@ -53,7 +53,6 @@ let rec no_side_effects (lam : Lam.t) : bool =
           | ("caml_register_named_value"
             (* register to c runtime does not make sense  in ocaml *)
             (* | "caml_set_oo_id"  *) (* it does have side effect, just in creation path it happens not to have *)
-            | "caml_is_js"
             | "caml_int64_float_of_bits"
              (* more safe to check if arguments are constant *)
             (* non-observable side effect *)    

jscomp/core/lam_dispatch_primitive.ml

@@ -594,7 +594,6 @@ let translate loc (prim_name : string)
     | "caml_sys_const_ostype_cygwin" -> E.caml_false 
     | "caml_sys_const_ostype_win32" -> E.caml_false 
     | "caml_sys_const_ostype_unix" -> E.caml_true
-    | "caml_is_js" -> E.caml_true
     | "caml_sys_get_config" ->
       (** No cross compilation *)
       Js_of_lam_tuple.make [E.str Sys.os_type; E.small_int  Sys.word_size; 

jscomp/stdlib/sys.ml

@@ -24,8 +24,6 @@ external word_size : unit -> int = "%word_size"
 external unix : unit -> bool = "%ostype_unix"
 external win32 : unit -> bool = "%ostype_win32"
 external cygwin : unit -> bool = "%ostype_cygwin"
-external is_js : unit -> bool = "caml_is_js"
-let is_js = is_js ()
 let (executable_name, argv) = get_argv()
 let (os_type, _, _) = get_config()
 let big_endian = big_endian ()

jscomp/stdlib/sys.mli

@@ -103,10 +103,6 @@ val big_endian : bool
 (** Whether the machine currently executing the Caml program is big-endian.
     @since 4.00.0 *)
 
-val is_js : bool 
-(** True if compiled against Javascript backend
-    @since 4.03.0
-*)
 val max_string_length : int
 (** Maximum length of strings and byte sequences. *)
 

jscomp/stdlib/sys.mlp

@@ -24,8 +24,6 @@ external word_size : unit -> int = "%word_size"
 external unix : unit -> bool = "%ostype_unix"
 external win32 : unit -> bool = "%ostype_win32"
 external cygwin : unit -> bool = "%ostype_cygwin"
-external is_js : unit -> bool = "caml_is_js"
-let is_js = is_js ()
 let (executable_name, argv) = get_argv()
 let (os_type, _, _) = get_config()
 let big_endian = big_endian ()

jscomp/test/.depend

@@ -452,7 +452,7 @@ nested_pattern_match_test.cmj :
 noassert.cmj :
 node_fs_test.cmj : ../others/node.cmj ../runtime/js.cmj
 node_path_test.cmj : ../runtime/js.cmj
-number_lexer.cmj : ../stdlib/sys.cmj ../stdlib/lexing.cmj
+number_lexer.cmj : ../stdlib/lexing.cmj
 obj_curry_test.cmj :
 obj_literal_ppx.cmj : ../stdlib/array.cmj
 obj_literal_ppx_test.cmj : ../runtime/js.cmj

jscomp/test/number_lexer.js

@@ -1,16 +1,12 @@
 'use strict';
 
-var Sys = require("../../lib/js/sys.js");
 var Curry = require("../../lib/js/curry.js");
 var Lexing = require("../../lib/js/lexing.js");
-var Pervasives = require("../../lib/js/pervasives.js");
 
-var l = Sys.is_js ? (function (prim) {
-      console.log(prim);
-      return /* () */0;
-    }) : (function (param) {
-      return Pervasives.output_string(Pervasives.stdout, param);
-    });
+function l(prim) {
+  console.log(prim);
+  return /* () */0;
+}
 
 var __ocaml_lex_tables = /* record */[
   /* lex_base */"\0\0\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff:\0\x85\0\xff\xff",

jscomp/test/number_lexer.ml

@@ -1,10 +1,14 @@
 # 1 "number_lexer.mll"
 
 external log : string -> unit = "caml_alloc_dummy" [@@bs.val "console.log"]
-let l = if Sys.is_js then log else output_string stdout
+let l = 
+#if BS then 
+ log 
+#else output_string stdout
+#end
 
 
-# 8 "number_lexer.ml"
+# 12 "number_lexer.ml"
 let __ocaml_lex_tables = {
   Lexing.lex_base = 
    "\000\000\246\255\247\255\248\255\249\255\250\255\251\255\252\255\
@@ -134,63 +138,63 @@ let rec token l lexbuf =
 and __ocaml_lex_token_rec l lexbuf __ocaml_lex_state =
   match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
       | 0 ->
-# 8 "number_lexer.mll"
+# 12 "number_lexer.mll"
                           ( l "new line" ; token l lexbuf)
-# 140 "number_lexer.ml"
+# 144 "number_lexer.ml"
 
   | 1 ->
-# 9 "number_lexer.mll"
+# 13 "number_lexer.mll"
                 ( l "number"; l (Lexing.lexeme lexbuf); token l lexbuf )
-# 145 "number_lexer.ml"
+# 149 "number_lexer.ml"
 
   | 2 ->
-# 10 "number_lexer.mll"
+# 14 "number_lexer.mll"
                       (l "ident"; l (Lexing.lexeme lexbuf); token l lexbuf)
-# 150 "number_lexer.ml"
+# 154 "number_lexer.ml"
 
   | 3 ->
-# 11 "number_lexer.mll"
+# 15 "number_lexer.mll"
                 ( l "+" ; token l lexbuf )
-# 155 "number_lexer.ml"
+# 159 "number_lexer.ml"
 
   | 4 ->
-# 12 "number_lexer.mll"
+# 16 "number_lexer.mll"
                 ( l "-" ; token l lexbuf)
-# 160 "number_lexer.ml"
+# 164 "number_lexer.ml"
 
   | 5 ->
-# 13 "number_lexer.mll"
+# 17 "number_lexer.mll"
                 ( l "*" ; token l lexbuf)
-# 165 "number_lexer.ml"
+# 169 "number_lexer.ml"
 
   | 6 ->
-# 14 "number_lexer.mll"
+# 18 "number_lexer.mll"
                 ( l "/" ; token l lexbuf)
-# 170 "number_lexer.ml"
+# 174 "number_lexer.ml"
 
   | 7 ->
-# 15 "number_lexer.mll"
+# 19 "number_lexer.mll"
                 ( l "(" ; token l lexbuf )
-# 175 "number_lexer.ml"
+# 179 "number_lexer.ml"
 
   | 8 ->
-# 16 "number_lexer.mll"
+# 20 "number_lexer.mll"
                 ( l ")"; token l lexbuf )
-# 180 "number_lexer.ml"
+# 184 "number_lexer.ml"
 
   | 9 ->
-# 17 "number_lexer.mll"
+# 21 "number_lexer.mll"
                 ( l "eof" )
-# 185 "number_lexer.ml"
+# 189 "number_lexer.ml"
 
   | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; 
       __ocaml_lex_token_rec l lexbuf __ocaml_lex_state
 
 ;;
 
-# 19 "number_lexer.mll"
+# 23 "number_lexer.mll"
 
 (* token l (Lexing.from_string "32 + 32 ( ) * / ") *)
 (* token (Lexing.from_string "32") *)
 
-# 197 "number_lexer.ml"
+# 201 "number_lexer.ml"

jscomp/test/number_lexer.mll

@@ -1,6 +1,10 @@
 {
 external log : string -> unit = "caml_alloc_dummy" [@@bs.val "console.log"]
-let l = if Sys.is_js then log else output_string stdout
+let l = 
+#if BS then 
+ log 
+#else output_string stdout
+#end
 
 }
 

jscomp/test/test_is_js.ml

@@ -1,3 +1,6 @@
-external is_js : unit ->  bool  = "caml_is_js" 
-
-let v = is_js ()
+let v =
+#if BS then  
+   true
+#else    
+  false
+#end  

lib/js/sys.js

@@ -3,8 +3,6 @@
 var Caml_sys = require("./caml_sys.js");
 var Caml_exceptions = require("./caml_exceptions.js");
 
-var is_js = true;
-
 var match = Caml_sys.caml_sys_get_argv(/* () */0);
 
 var big_endian = false;
@@ -92,7 +90,6 @@ exports.win32 = win32;
 exports.cygwin = cygwin;
 exports.word_size = word_size;
 exports.big_endian = big_endian;
-exports.is_js = is_js;
 exports.max_string_length = max_string_length;
 exports.max_array_length = max_array_length;
 exports.set_signal = set_signal;

lib/whole_compiler.ml

@@ -94822,7 +94822,6 @@ let rec no_side_effects (lam : Lam.t) : bool =
           | ("caml_register_named_value"
             (* register to c runtime does not make sense  in ocaml *)
             (* | "caml_set_oo_id"  *) (* it does have side effect, just in creation path it happens not to have *)
-            | "caml_is_js"
             | "caml_int64_float_of_bits"
              (* more safe to check if arguments are constant *)
             (* non-observable side effect *)    
@@ -103673,7 +103672,6 @@ let translate loc (prim_name : string)
     | "caml_sys_const_ostype_cygwin" -> E.caml_false 
     | "caml_sys_const_ostype_win32" -> E.caml_false 
     | "caml_sys_const_ostype_unix" -> E.caml_true
-    | "caml_is_js" -> E.caml_true
     | "caml_sys_get_config" ->
       (** No cross compilation *)
       Js_of_lam_tuple.make [E.str Sys.os_type; E.small_int  Sys.word_size;