Merge pull request #4165 from BuckleScript/code_gen_platform_agnostic

make code gen platform agnostic (fix #4162)

Author: bobzhang

jscomp/core/builtin_cmi_datasets.ml

@@ -118,7 +118,7 @@ val switch : t -> lambda_switch -> t
 val stringswitch : t -> (string * t) list -> t option -> t 
 
 (* val true_ : t  *)
-(* val false_ : t  *)
+val false_ : t 
 val unit : t 
 
 (** convert [l || r] to [if l then true else r]*)

jscomp/core/builtin_cmj_datasets.ml

@@ -147,14 +147,11 @@ type bigarray_layout = Lambda.bigarray_layout =
   | Pbigarray_c_layout -> p1 = Pbigarray_c_layout
   | Pbigarray_fortran_layout -> p1 = Pbigarray_fortran_layout   *)
 
-type compile_time_constant = Lambda.compile_time_constant = 
-    | Big_endian
-    | Word_size
-    | Int_size
-    | Max_wosize
+type compile_time_constant =
+    | Big_endian  
     | Ostype_unix
-    | Ostype_win32
-    | Ostype_cygwin
+    | Ostype_win32    
+    | Ostype
     | Backend_type
 
 (** relies on the fact that [compile_time_constant] is enum type *)

jscomp/core/lam.mli

@@ -52,14 +52,11 @@ type bigarray_layout = Lambda.bigarray_layout =
 
 
 
-type compile_time_constant = Lambda.compile_time_constant = 
+type compile_time_constant = 
   | Big_endian
-  | Word_size
-  | Int_size
-  | Max_wosize
   | Ostype_unix
   | Ostype_win32
-  | Ostype_cygwin
+  | Ostype
   | Backend_type
 
 

jscomp/core/lam_compat.ml

@@ -587,15 +587,19 @@ let translate  loc
   | Pctconst ct -> 
     (match ct with 
      | Big_endian -> E.bool Sys.big_endian
-     | Word_size -> 
-       E.small_int  Sys.word_size
-     | Ostype_unix -> E.bool Sys.unix
-     | Ostype_win32 -> E.bool Sys.win32      
-     | Ostype_cygwin -> E.bool Sys.cygwin
-     | Int_size -> E.int 32l
-     | Max_wosize ->
+     | Ostype ->
+      (E.runtime_call Js_runtime_modules.sys "os_type" args)
+     | Ostype_unix -> 
+       E.string_equal
+       (E.runtime_call Js_runtime_modules.sys "os_type" args)
+         (E.str "Unix")
+     | Ostype_win32 -> 
+       E.string_equal
+         (E.runtime_call Js_runtime_modules.sys "os_type" args)
+         (E.str "Win32")
+     (* | Max_wosize ->
       (* max_array_length*)
-       E.int 2147483647l (* 2 ^ 31 - 1 *) 
+       E.int 2147483647l (* 2 ^ 31 - 1 *)  *)
         (* 4_294_967_295l  not representable*)
         (* 2 ^ 32 - 1*)
      | Backend_type  -> 

jscomp/core/lam_compat.mli

@@ -378,9 +378,19 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
   | Pbigstring_set_64 x -> prim ~primitive:(Pbigstring_set_64 x) ~args loc
   | Pctconst x ->
     begin match x with
-      | Word_size ->
-        Lam.const (Const_int 32) 
-      | _ -> prim ~primitive:(Pctconst x) ~args loc
+      | Word_size 
+      | Int_size -> Lam.const(Const_int 32)  
+      | Max_wosize -> Lam.const (Const_int 2147483647)
+      | Big_endian
+        -> prim ~primitive:(Pctconst Big_endian) ~args loc
+      | Ostype_unix
+        -> prim ~primitive:(Pctconst Ostype_unix) ~args loc
+      | Ostype_win32
+        -> prim ~primitive:(Pctconst Ostype_win32) ~args loc
+      | Ostype_cygwin
+        -> Lam.false_
+      | Backend_type
+        -> prim ~primitive:(Pctconst Backend_type) ~args loc
     end
 
   | Pbbswap x -> prim ~primitive:(Pbbswap x) ~args loc
@@ -497,8 +507,8 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
       prim ~primitive:Pdebugger ~args:[] loc
     | _ when s = "#null" ->
       Lam.const (Const_js_null)
-    | _ when s = "#os_type" ->    
-      Lam.const (Const_string Sys.os_type)
+    | _ when s = "#os_type" ->   
+      prim ~primitive:(Pctconst Ostype) ~args:[unit] loc 
     | _ when s = "#undefined" ->
       Lam.const (Const_js_undefined)
     | _ when s = "#init_mod" ->

jscomp/core/lam_compile_primitive.ml

@@ -610,19 +610,6 @@ let translate loc (prim_name : string)
     | "caml_set_oo_id" (* needed in {!camlinternalOO.set_id} *)
       ->
       Js_of_lam_exception.caml_set_oo_id args 
-    | "caml_sys_const_big_endian" -> 
-      (** return false *)
-      E.bool Sys.big_endian
-    | "caml_sys_const_word_size" -> 
-      E.small_int  Sys.word_size
-    (** TODO: How it will affect program behavior *)
-    | "caml_sys_const_ostype_cygwin" -> E.false_
-    | "caml_sys_const_ostype_win32" -> E.false_
-    | "caml_sys_const_ostype_unix" -> E.true_
-    | "caml_sys_get_config" ->
-      (** No cross compilation *)
-      Js_of_lam_tuple.make [E.str Sys.os_type; E.small_int  Sys.word_size; 
-                            E.bool Sys.big_endian ]
     | "caml_sys_get_argv" 
     (** TODO: refine
         Inlined here is helpful for DCE

jscomp/core/lam_convert.ml

@@ -232,13 +232,10 @@ let primitive ppf (prim : Lam_primitive.t) = match prim with
   | Parraysets  -> fprintf ppf "array.set"
   | Pctconst c ->
     let const_name = match c with
-      | Big_endian -> "big_endian"
-      | Word_size -> "word_size"
+      | Big_endian -> "big_endian"      
       | Ostype_unix -> "ostype_unix"
       | Ostype_win32 -> "ostype_win32"
-      | Ostype_cygwin -> "ostype_cygwin" 
-      | Int_size -> "int_size"
-      | Max_wosize -> "max_wosize"
+      | Ostype -> "ostype"
       | Backend_type -> "backend_type"
     in
     fprintf ppf "sys.constant_%s" const_name

jscomp/core/lam_dispatch_primitive.ml

@@ -34,8 +34,19 @@ let caml_sys_getenv s =
     | None -> raise Not_found
     | Some x -> x 
 
-
-
+(* https://nodejs.org/dist/latest-v12.x/docs/api/os.html#os_os_platform 
+  The value is set at compile time. Possible values are 'aix', 'darwin','freebsd', 'linux', 'openbsd', 'sunos', and 'win32'.
+  The return value is equivalent to process.platform. 
+  NodeJS does not support Cygwin very well
+*)
+let os_type : unit -> string = [%raw{|function(_){
+  if(typeof process !== 'undefined' && process.platform === 'win32'){
+        return "Win32"    
+  }
+  else {
+    return "Unix"
+  }
+}|}]
 (* TODO: improve [js_pass_scope] to avoid remove unused n here *)
 
 external now : unit -> float = "" [@@bs.val "Date.now"]