Merge pull request #3750 from BuckleScript/fix_4.06

fix 4.06 branch

Author: bobzhang

jscomp/bsb_helper/bsb_arg.ml

@@ -111,17 +111,19 @@ let parse_exn  (speclist : t) anonfun errmsg =
             incr current;
         | Int f when !current + 1 < l ->
             let arg = argv.(!current + 1) in
-            begin try f (int_of_string arg)
-            with Failure "int_of_string" ->
-                   raise (Stop (Wrong (s, arg, "an integer")))
+            begin match int_of_string arg with 
+              | i -> f i 
+              | exception _ 
+                ->
+                raise (Stop (Wrong (s, arg, "an integer")))
             end;
             incr current;
         | Set_int r when !current + 1 < l ->
             let arg = argv.(!current + 1) in
-            begin try r := (int_of_string arg)
-            with Failure "int_of_string" ->
-                   raise (Stop (Wrong (s, arg, "an integer")))
-            end;
+            r := (try int_of_string arg
+                  with _ ->
+                    raise (Stop (Wrong (s, arg, "an integer")))
+                 );
             incr current;
         | _ -> raise (Stop (Missing s))
         in

jscomp/core/js_implementation.ml

@@ -99,7 +99,7 @@ let interface_mliast ppf fname outputprefix  =
 
 let get_lambda = fun   
 #if OCAML_VERSION =~ ">4.03.0" then
-              {code = lambda}
+              {Lambda.code = lambda}
 #else
               lambda
 #end              -> lambda 

lib/4.02.3/bsb_helper.ml

@@ -1555,17 +1555,19 @@ let parse_exn  (speclist : t) anonfun errmsg =
             incr current;
         | Int f when !current + 1 < l ->
             let arg = argv.(!current + 1) in
-            begin try f (int_of_string arg)
-            with Failure "int_of_string" ->
-                   raise (Stop (Wrong (s, arg, "an integer")))
+            begin match int_of_string arg with 
+              | i -> f i 
+              | exception _ 
+                ->
+                raise (Stop (Wrong (s, arg, "an integer")))
             end;
             incr current;
         | Set_int r when !current + 1 < l ->
             let arg = argv.(!current + 1) in
-            begin try r := (int_of_string arg)
-            with Failure "int_of_string" ->
-                   raise (Stop (Wrong (s, arg, "an integer")))
-            end;
+            r := (try int_of_string arg
+                  with _ ->
+                    raise (Stop (Wrong (s, arg, "an integer")))
+                 );
             incr current;
         | _ -> raise (Stop (Missing s))
         in