improve effects of caml_float_of_string

Author: bobzhang

jscomp/runtime/caml_format.ml

@@ -570,7 +570,6 @@ let caml_format_float fmt x =
     end;
   finish_formatting f !s
 
-
 (**
  external float_of_string : string -> float = "caml_float_of_string"
  pervasives.ml
@@ -584,8 +583,8 @@ let caml_format_float fmt x =
  FIXME: arity of float_of_string is not inferred correctly
 *)
 
-let float_of_string : string -> (string -> 'a) ->  float = [%bs.raw {|
-  function (s, caml_failwith) {
+let float_of_string : string -> exn ->  float  = fun%raw s exn -> {| 
+   {
     var res = +s;
     if ((s.length > 0) && (res === res))
         return res;
@@ -606,13 +605,18 @@ let float_of_string : string -> (string -> 'a) ->  float = [%bs.raw {|
         return Infinity;
     if (/^-inf(inity)?$/i.test(s))
         return -Infinity;
-    caml_failwith("float_of_string");
+    throw exn;
 }
 
 |}
-]
 
-let caml_float_of_string s = float_of_string s caml_failwith
+
+(* let float_of_string (s : string) : float = 
+  let res : float = [%raw{|+s|}] in 
+  if String.length s > 0 && res = res then res 
+  else  *)
+
+let caml_float_of_string s = float_of_string s (Failure "float_of_string") 
 
 let caml_nativeint_format = caml_format_int
 let caml_int32_format = caml_format_int

lib/js/caml_format.js

@@ -1,18 +1,10 @@
 'use strict';
 
-var Curry = require("./curry.js");
 var Caml_int32 = require("./caml_int32.js");
 var Caml_int64 = require("./caml_int64.js");
 var Caml_utils = require("./caml_utils.js");
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
 
-function caml_failwith(s) {
-  throw [
-        Caml_builtin_exceptions.failure,
-        s
-      ];
-}
-
 function parse_digit(c) {
   if (c >= 65) {
     if (c >= 97) {
@@ -778,8 +770,8 @@ function caml_format_float(fmt, x) {
   return finish_formatting(f, s);
 }
 
-var float_of_string = (
-  function (s, caml_failwith) {
+var float_of_string = function (s,exn){ 
+   {
     var res = +s;
     if ((s.length > 0) && (res === res))
         return res;
@@ -800,13 +792,16 @@ var float_of_string = (
         return Infinity;
     if (/^-inf(inity)?$/i.test(s))
         return -Infinity;
-    caml_failwith("float_of_string");
+    throw exn;
 }
 
-);
+};
 
 function caml_float_of_string(s) {
-  return Curry._2(float_of_string, s, caml_failwith);
+  return float_of_string(s, [
+              Caml_builtin_exceptions.failure,
+              "float_of_string"
+            ]);
 }
 
 var caml_nativeint_format = caml_format_int;
@@ -827,4 +822,4 @@ exports.caml_int_of_string = caml_int_of_string;
 exports.caml_int32_of_string = caml_int32_of_string;
 exports.caml_int64_of_string = caml_int64_of_string;
 exports.caml_nativeint_of_string = caml_nativeint_of_string;
-/* float_of_string Not a pure module */
+/* Caml_utils Not a pure module */