WIP

Author: hhugo

compiler/lib/javascript.ml

@@ -42,6 +42,8 @@ module Num : sig
 
   val is_neg : t -> bool
 
+  val is_int : t -> bool
+
   (** Arithmetic *)
 
   val add : t -> t -> t
@@ -134,6 +136,11 @@ end = struct
 
   let is_neg s = Char.equal s.[0] '-'
 
+  let is_int s =
+    String.for_all s ~f:(function
+      | '0' .. '9' | '-' -> true
+      | _ -> false)
+
   let neg s =
     match String.drop_prefix s ~prefix:"-" with
     | None -> "-" ^ s

compiler/lib/javascript.mli

@@ -43,6 +43,8 @@ module Num : sig
 
   val is_neg : t -> bool
 
+  val is_int : t -> bool
+
   (** Arithmetic *)
 
   val add : t -> t -> t

compiler/lib/js_traverse.ml

@@ -1705,13 +1705,18 @@ class simpl =
       match e with
       | EBin (Plus, e1, e2) -> (
           match e1, e2 with
-          | _, ENum n when Num.is_neg n -> EBin (Minus, e1, ENum (Num.neg n))
-          | ENum n, _ when Num.is_neg n -> EBin (Minus, e2, ENum (Num.neg n))
-          | ENum zero, (ENum _ as x) when Num.is_zero zero -> x
-          | (ENum _ as x), ENum zero when Num.is_zero zero -> x
+          | ENum n1, ENum n2 when Num.is_int n1 && Num.is_int n2 -> ENum (Num.add n1 n2)
+          | _, ENum n when Num.is_neg n ->
+              m#expression (EBin (Minus, e1, ENum (Num.neg n)))
+          | ENum n, _ when Num.is_neg n ->
+              m#expression (EBin (Minus, e2, ENum (Num.neg n)))
+          | ENum zero, x when Num.is_zero zero -> x
+          | x, ENum zero when Num.is_zero zero -> x
           | _ -> e)
       | EBin (Minus, e1, e2) -> (
           match e1, e2 with
+          | EBin (Minus, e0, ENum n1), ENum n2 when Num.is_int n1 && Num.is_int n2 ->
+              EBin (Minus, e0, ENum (Num.add n1 n2))
           | _, ENum n when Num.is_neg n -> EBin (Plus, e1, ENum (Num.neg n))
           | (ENum _ as x), ENum zero when Num.is_zero zero -> x
           | _ -> e)

compiler/tests-compiler/gh1354.ml

@@ -67,7 +67,7 @@ with Exit ->
        catch(_e_){
         var _c_ = caml_wrap_exception(_e_);
         if(_c_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_c_, 0);
-        caml_call2(Stdlib_Printf[3], _d_, _b_ + 0 | 0);
+        caml_call2(Stdlib_Printf[3], _d_, _b_ | 0);
         var Test = [0];
         runtime.caml_register_global(3, Test, "Test");
         0;
@@ -148,14 +148,14 @@ with Exit ->
          throw caml_maybe_attach_backtrace(Stdlib[3], 1);
         }
         catch(_k_){
-         caml_call3(Stdlib_Printf[3], _h_, _g_ + 0 | 0, _b_);
+         caml_call3(Stdlib_Printf[3], _h_, _g_ | 0, _b_);
          throw caml_maybe_attach_backtrace(Stdlib[3], 1);
         }
        }
        catch(_j_){
         var _d_ = caml_wrap_exception(_j_);
         if(_d_ !== Stdlib[3]) throw caml_maybe_attach_backtrace(_d_, 0);
-        caml_call3(Stdlib_Printf[3], _e_, _c_ + 0 | 0, _b_);
+        caml_call3(Stdlib_Printf[3], _e_, _c_ | 0, _b_);
         var Test = [0];
         runtime.caml_register_global(4, Test, "Test");
         0;

compiler/tests-compiler/gh747.ml

@@ -334,7 +334,7 @@ end
     114:       /*<<test.ml:66:6>>*/ return caml_call2(Stdlib_Printf[1], outchan, _d_) /*<<test.ml:73:10>>*/ ;
     115:     var
     116:      a =  /*<<test.ml:64:2>>*/ backtrace[1],
-    117:      _f_ =  /*<<test.ml:69:6>>*/ a.length - 1 - 1 | 0,
+    117:      _f_ =  /*<<test.ml:69:6>>*/ a.length - 2 | 0,
     118:      _e_ = 0;
     119:     if(_f_ >= 0){
     120:      var i = _e_;