Merge pull request #3158 from BuckleScript/hex_float

Fix #393 in 4.06

Author: bobzhang

jscomp/common/bs_warnings.ml

@@ -87,7 +87,12 @@ let warn_missing_primitive loc txt =
       Format.pp_print_flush warning_formatter ()
     end
 
-
+let warn_literal_overflow loc = 
+  begin 
+    print_string_warning loc 
+      "Integer literal exceeds the range of representable integers of type int";
+    Format.pp_print_flush warning_formatter ()  
+  end 
 
 let error_unescaped_delimiter loc txt = 
   raise (Error(loc, Uninterpreted_delimiters txt))

jscomp/common/bs_warnings.mli

@@ -31,5 +31,7 @@ val prerr_bs_ffi_warning : Location.t -> t -> unit
 
 val warn_missing_primitive : Location.t -> string -> unit 
 
+val warn_literal_overflow : Location.t -> unit 
+
 val error_unescaped_delimiter : 
   Location.t -> string  -> unit 

jscomp/syntax/bs_ast_invariant.ml

@@ -86,7 +86,7 @@ let emit_external_warnings : iterator=
     default_iterator with
     attribute = (fun _ attr -> warn_unused_attribute attr);
     expr = (fun self a -> 
-        match a.Parsetree.pexp_desc with 
+        match a.pexp_desc with 
         | Pexp_constant (
 #if OCAML_VERSION =~ ">4.03.0"  then
           Pconst_string
@@ -96,6 +96,23 @@ let emit_external_warnings : iterator=
           (_, Some s)) 
           when Ast_utf8_string_interp.is_unescaped s -> 
           Bs_warnings.error_unescaped_delimiter a.pexp_loc s 
+#if OCAML_VERSION =~ ">4.03.0" then
+        | Pexp_constant(Pconst_integer(s,None)) -> 
+          (* range check using int32 
+            It is better to give a warning instead of error to avoid make people unhappy.
+            It also has restrictions in which platform bsc is running on since it will 
+            affect int ranges
+          *)
+          (
+            try 
+              ignore (
+                if String.length s = 0 || s.[0] = '-' then 
+                  Int32.of_string s 
+                else Int32.of_string ("-" ^ s))
+            with _ ->              
+              Bs_warnings.warn_literal_overflow a.pexp_loc
+          )
+#end
         | _ -> default_iterator.expr self a 
       );
     value_description =

jscomp/test/Makefile

@@ -269,6 +269,7 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	fun_pattern_match\
 	gpr_3142_test\
 	gpr_3154_test\
+	gpr_373_test\
 	ocaml_typedtree_test
 # ocaml_typedtree_test is not cross version due to camlinternalFormat
 # bs_uncurry_test

jscomp/test/gpr_373_test.js

@@ -0,0 +1,16 @@
+'use strict';
+
+
+var overflow_dec_i32_number = 272872590;
+
+var overflow_dec_i32_number_2 = 0;
+
+var not_overflow_dec_i32_number_3 = -1;
+
+var overflow_hex_i32_number = -1;
+
+exports.overflow_dec_i32_number = overflow_dec_i32_number;
+exports.overflow_dec_i32_number_2 = overflow_dec_i32_number_2;
+exports.not_overflow_dec_i32_number_3 = not_overflow_dec_i32_number_3;
+exports.overflow_hex_i32_number = overflow_hex_i32_number;
+/* No side effect */

jscomp/test/gpr_373_test.ml

@@ -0,0 +1,10 @@
+
+
+let overflow_dec_i32_number = 949_460_645_006
+
+let overflow_dec_i32_number_2  = 4611686018427387904 (* max_int + 1*)
+
+let overflow_dec_i32_number_2  = 4611686018427387904
+
+let not_overflow_dec_i32_number_3 = 0xffff_ffff
+let overflow_hex_i32_number = 0xffff_ffffl

jscomp/xwatcher/xwatcher_current.js

@@ -80,6 +80,7 @@ if (exit === 1) {
         "common",
         "super_errors",
         ".",
+        "stubs",
         "stdlib-406"
       ]);
   exec(/* () */0);

jscomp/xwatcher/xwatcher_current.ml

@@ -57,6 +57,8 @@ let () =
            "common";
            "super_errors";
            ".";
+           "stubs";
+           
            "stdlib-406" ; (* evolve *)
         |];
 

scripts/watcher.js

@@ -260,6 +260,7 @@ if (exit === 1) {
         "common",
         "super_errors",
         ".",
+        "stubs",
         "stdlib-406"
       ]);
   exec(/* () */0);