less ad-hoc, the remaining part: stdin,stdout,stderr

Author: bobzhang

jscomp/core/lam_compile_main.ml

@@ -71,36 +71,6 @@ let compile_group ({filename = file_name; env;} as meta : Lam_stats.t)
      Note the arity of [print_endline] is already analyzed before, 
      so it should be safe
   *)
-  (* | Single(_, ({name="string_of_int";_} as id),_ ),  "pervasives.ml" ->
-    Js_output.of_stmt @@ S.alias_variable id
-      ~exp:( 
-        let arg = Ext_ident.create "param" in
-        E.ocaml_fun [arg] [S.return_stmt (E.int_to_string (E.var arg))]
-      ) *)
-
-  (** Special handling for values in [Sys] *)
-  | Single(_, ({name="max_array_length" | "max_string_length";_} as id) ,_ ),  "sys.ml" ->
-    (* See [js_knowledge] Array size section, can not be expressed by OCaml int,
-       note that casual handling of {!Sys.max_string_length} could result into 
-       negative value which could cause wrong behavior of {!Buffer.create}
-    *)
-    Js_output.of_stmt @@ S.alias_variable id ~exp:(E.float "2147483647")  (*2 ^ 31 - 1*)
-
-  | Single(_, ({name="max_int";_} as id) ,_ ),  ("sys.ml" | "nativeint.ml") ->
-    (* See [js_knowledge] Max int section, (2. ** 53. -. 1.;;)
-       can not be expressed by OCaml int 
-       FIXME: we need handle {!Nativeint} and {!Sys} differently
-    *)
-    Js_output.of_stmt @@ S.alias_variable id 
-      ~exp:(E.float "9007199254740991.") 
-
-  | Single(_, ({name="min_int";_} as id) ,_ ),  ("sys.ml" | "nativeint.ml") ->
-    (* See [js_knowledge] Max int section, -. (2. ** 53. -. 1.);;
-       can not be expressed by OCaml int 
-       FIXME: we need handle {!Nativeint} and {!Sys} differently
-    *)
-    Js_output.of_stmt @@ S.alias_variable id
-      ~exp:(E.float ("-9007199254740991.")) 
 
   | Single (kind, id, lam), _ -> 
     (* let lam = Optimizer.simplify_lets [] lam in  *)

jscomp/stdlib/nativeint.ml

@@ -40,11 +40,13 @@ let pred n = sub n 1n
 let abs n = if n >= 0n then n else neg n
 #if BS then
 let size = 54 (* 54 is not a multiple of 8 *)
+let min_int = -9007199254740991n
+let max_int = 9007199254740991n
 #else
 let size = Sys.word_size
-#end
 let min_int = shift_left 1n (size - 1)
 let max_int = sub min_int 1n
+#end
 let lognot n = logxor n (-1n)
 
 external format : string -> nativeint -> string = "caml_nativeint_format"

jscomp/stdlib/sys.ml

@@ -33,9 +33,13 @@ let word_size = word_size ()
 let unix = unix ()
 let win32 = win32 ()
 let cygwin = cygwin ()
+#if BS then
+let max_array_length = 2147483647 (* 2^ 31 - 1 *)
+let max_string_length = 2147483647
+#else    
 let max_array_length = (1 lsl (word_size - 10)) - 1;;
 let max_string_length = word_size / 8 * max_array_length - 1;;
-
+#end
 external file_exists: string -> bool = "caml_sys_file_exists"
 external is_directory : string -> bool = "caml_sys_is_directory"
 external remove: string -> unit = "caml_sys_remove"

lib/js/nativeint.js

@@ -19,10 +19,6 @@ function abs(n) {
   }
 }
 
-var min_int = -9007199254740991;
-
-var max_int = 9007199254740991;
-
 function lognot(n) {
   return n ^ -1;
 }
@@ -41,6 +37,10 @@ var minus_one = -1;
 
 var size = 54;
 
+var max_int = 9007199254740991;
+
+var min_int = -9007199254740991;
+
 exports.zero = zero;
 exports.one = one;
 exports.minus_one = minus_one;

lib/js/sys.js

@@ -15,10 +15,6 @@ var win32 = /* false */0;
 
 var cygwin = /* false */0;
 
-var max_array_length = 2147483647;
-
-var max_string_length = 2147483647;
-
 var interactive = [/* false */0];
 
 function set_signal(_, _$1) {
@@ -39,6 +35,10 @@ var os_type = "Unix";
 
 var word_size = 32;
 
+var max_string_length = 2147483647;
+
+var max_array_length = 2147483647;
+
 var sigabrt = -1;
 
 var sigalrm = -2;

lib/whole_compiler.ml

@@ -101836,36 +101836,6 @@ let compile_group ({filename = file_name; env;} as meta : Lam_stats.t)
      Note the arity of [print_endline] is already analyzed before, 
      so it should be safe
   *)
-  (* | Single(_, ({name="string_of_int";_} as id),_ ),  "pervasives.ml" ->
-    Js_output.of_stmt @@ S.alias_variable id
-      ~exp:( 
-        let arg = Ext_ident.create "param" in
-        E.ocaml_fun [arg] [S.return_stmt (E.int_to_string (E.var arg))]
-      ) *)
-
-  (** Special handling for values in [Sys] *)
-  | Single(_, ({name="max_array_length" | "max_string_length";_} as id) ,_ ),  "sys.ml" ->
-    (* See [js_knowledge] Array size section, can not be expressed by OCaml int,
-       note that casual handling of {!Sys.max_string_length} could result into 
-       negative value which could cause wrong behavior of {!Buffer.create}
-    *)
-    Js_output.of_stmt @@ S.alias_variable id ~exp:(E.float "2147483647")  (*2 ^ 31 - 1*)
-
-  | Single(_, ({name="max_int";_} as id) ,_ ),  ("sys.ml" | "nativeint.ml") ->
-    (* See [js_knowledge] Max int section, (2. ** 53. -. 1.;;)
-       can not be expressed by OCaml int 
-       FIXME: we need handle {!Nativeint} and {!Sys} differently
-    *)
-    Js_output.of_stmt @@ S.alias_variable id 
-      ~exp:(E.float "9007199254740991.") 
-
-  | Single(_, ({name="min_int";_} as id) ,_ ),  ("sys.ml" | "nativeint.ml") ->
-    (* See [js_knowledge] Max int section, -. (2. ** 53. -. 1.);;
-       can not be expressed by OCaml int 
-       FIXME: we need handle {!Nativeint} and {!Sys} differently
-    *)
-    Js_output.of_stmt @@ S.alias_variable id
-      ~exp:(E.float ("-9007199254740991.")) 
 
   | Single (kind, id, lam), _ -> 
     (* let lam = Optimizer.simplify_lets [] lam in  *)