Merge pull request #2601 from BuckleScript/less_ad_hoc_pervasives_processing

specialize string_of_int and less ad-hoc module post-processing

Author: bobzhang

jscomp/all.depend

@@ -675,8 +675,8 @@ core/lam_compile_main.cmx : ext/literals.cmx core/lam_util.cmx \
     core/js_exp_make.cmx core/js_dump_program.cmx common/js_config.cmx \
     core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx ext/ext_string.cmx \
     ext/ext_pervasives.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
-    common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
-    ext/ext_filename.cmx ext/ext_char.cmx core/lam_compile_main.cmi
+    common/ext_log.cmx ext/ext_list.cmx ext/ext_filename.cmx ext/ext_char.cmx \
+    core/lam_compile_main.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_main.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_namespace.cmx \

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/pervasives.ml

@@ -244,9 +244,12 @@ let bool_of_string = function
   | "false" -> false
   | _ -> invalid_arg "bool_of_string"
 
+#if BS then   
+external string_of_int : int -> string = "String" [@@bs.val]
+#else
 let string_of_int n =
   format_int "%d" n
-
+#end
 external int_of_string : string -> int = "caml_int_of_string"
 external string_get : string -> int -> char = "%string_safe_get"
 

jscomp/stdlib/pervasives.mli

@@ -568,9 +568,12 @@ val bool_of_string : string -> bool
    Raise [Invalid_argument "bool_of_string"] if the string is not
    ["true"] or ["false"]. *)
 
+#if BS then    
+external string_of_int : int -> string = "String" [@@bs.val]
+#else
 val string_of_int : int -> string
 (** Return the string representation of an integer, in decimal. *)
-
+#end
 external int_of_string : string -> int = "caml_int_of_string"
 (** Convert the given string to an integer.
    The string is read in decimal (by default) or in hexadecimal (if it

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"

jscomp/test/a_filename_test.js

@@ -13,7 +13,7 @@ function eq(loc, x, y) {
   test_id[0] = test_id[0] + 1 | 0;
   suites[0] = /* :: */[
     /* tuple */[
-      loc + (" id " + test_id[0]),
+      loc + (" id " + String(test_id[0])),
       (function () {
           return /* Eq */Block.__(0, [
                     x,

jscomp/test/a_scope_bug.js

@@ -7,7 +7,7 @@ function odd(_z) {
     var z = _z;
     var even = Caml_int32.imul(z, z);
     var a = (even + 4 | 0) + even | 0;
-    console.log("" + a);
+    console.log(String(a));
     _z = 32;
     continue ;
 

jscomp/test/arity_deopt.js

@@ -12,7 +12,7 @@ function eq(loc, x, y) {
   test_id[0] = test_id[0] + 1 | 0;
   suites[0] = /* :: */[
     /* tuple */[
-      loc + (" id " + test_id[0]),
+      loc + (" id " + String(test_id[0])),
       (function () {
           return /* Eq */Block.__(0, [
                     x,

jscomp/test/array_subtle_test.js

@@ -15,7 +15,7 @@ function eq(loc, param) {
   test_id[0] = test_id[0] + 1 | 0;
   suites[0] = /* :: */[
     /* tuple */[
-      loc + (" id " + test_id[0]),
+      loc + (" id " + String(test_id[0])),
       (function () {
           return /* Eq */Block.__(0, [
                     x,