snapshot changes

Author: bobzhang

jscomp/test/prepend_data_ffi.js

@@ -42,7 +42,7 @@ function f(x) {
       ]);
   x.xx(112, 3, "xxx", 1, 2, 3);
   x.xx(113, 3, "xxx", 0, "b", 1, 2, 3, 4, 5);
-  x.xx(114, 3, true, false, ("你好"), (["你好",1,2,3]), ([{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}]), ([{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}]), "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);
+  x.xx(114, 3, true, false, "你好", ["你好",1,2,3], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}], "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);
 
 }
 

jscomp/test/reactDOMRe.js

@@ -86,7 +86,7 @@ function createElementVariadic(domClassName, props, children) {
 function unsafeAddProp(style, key, value) {
   var dict = { };
   dict[key] = value;
-  return Object.assign(({}), style, dict);
+  return Object.assign({}, style, dict);
 }
 
 var Style = {

jscomp/test/reasonReactRouter.js

@@ -182,7 +182,7 @@ function useUrl(serverUrl, param) {
           return (function (param) {
                     return unwatchUrl(watcherId);
                   });
-        }), ([]));
+        }), []);
   return url$1;
 }
 

lib/4.06.1/unstable/js_compiler.ml

@@ -83643,6 +83643,7 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
+  | Js_raw_json
   | Js_exp_unknown
 
 
@@ -88550,7 +88551,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
     (match info with
      | Exp exp_info ->
        let raw_paren =
-          not (match exp_info with  Js_literal _ -> true | _ -> false || raw_snippet_exp_simple_enough s) in 
+          not (match exp_info with  
+            | Js_literal _ | Js_raw_json -> true 
+            | Js_function _ | Js_exp_unknown -> false || raw_snippet_exp_simple_enough s) in 
        if raw_paren then P.string f L.lparen;
        P.string f s ;       
        if raw_paren then  P.string f L.rparen;
@@ -109197,7 +109200,7 @@ let translate_arg_cst (cst : External_arg_spec.cst) =
      E.str i
    | Arg_js_null  -> E.nil
    | Arg_js_json s 
-     -> E.raw_js_code (Exp Js_exp_unknown) s
+     -> E.raw_js_code (Exp Js_raw_json) s
 
    | Arg_js_true  -> E.bool true
    | Arg_js_false -> E.bool false 

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -12041,6 +12041,7 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
+  | Js_raw_json
   | Js_exp_unknown
 
 
@@ -380994,7 +380995,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
     (match info with
      | Exp exp_info ->
        let raw_paren =
-          not (match exp_info with  Js_literal _ -> true | _ -> false || raw_snippet_exp_simple_enough s) in 
+          not (match exp_info with  
+            | Js_literal _ | Js_raw_json -> true 
+            | Js_function _ | Js_exp_unknown -> false || raw_snippet_exp_simple_enough s) in 
        if raw_paren then P.string f L.lparen;
        P.string f s ;       
        if raw_paren then  P.string f L.rparen;
@@ -384188,7 +384191,169 @@ let rec
     | _ -> false)  
   | Lstaticraise(id,ls) -> 
     (match l2 with  Lstaticraise(id1,ls1) -> 
-      id  = id1 t64  cmp a b)
+      id  = id1 && eq_approx_list ls ls1
+    | _ -> false)
+  | Lprim info1 -> 
+    (match l2 with 
+    Lprim info2 ->
+    Lam_primitive.eq_primitive_approx info1.primitive info2.primitive &&
+    eq_approx_list info1.args info2.args
+    | _ -> false)
+  | Lstringswitch _ -> false  
+  | Lfunction _  
+  | Llet (_,_,_,_)
+  | Lletrec _
+  | Lswitch _   
+  | Lstaticcatch _ 
+  | Ltrywith _ 
+  | Lfor (_,_,_,_,_) 
+  | Lsend _
+    -> false    
+
+and eq_approx_list ls ls1 =  Ext_list.for_all2_no_exn ls ls1 eq_approx
+
+
+
+
+let switch lam (lam_switch : lambda_switch) : t =
+  match lam with
+  | Lconst ((Const_pointer (i,_) |  (Const_int {value = i})))
+    ->
+    Ext_list.assoc_by_int   lam_switch.sw_consts i lam_switch.sw_failaction
+  | Lconst (Const_block (i,_,_)) ->
+    Ext_list.assoc_by_int lam_switch.sw_blocks i lam_switch.sw_failaction 
+  | _ ->
+    Lswitch(lam,lam_switch)
+
+let stringswitch (lam : t) cases default : t =
+  match lam with
+  | Lconst (Const_string a) ->
+    Ext_list.assoc_by_string  cases a default
+  | _ -> Lstringswitch(lam, cases, default)
+
+
+let true_ : t =
+  Lconst (Const_js_true)
+
+let false_ : t =
+  Lconst (Const_js_false)
+
+let unit : t = Lconst Const_js_undefined
+
+
+
+
+
+let rec seq (a : t) b : t =
+   match a with
+  | Lprim 
+    {primitive = Pmakeblock(_); 
+     args= x::xs} -> 
+    seq (Ext_list.fold_left xs x seq ) b 
+  | Lprim {primitive = Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt; args = [a]} 
+    ->   seq a b 
+  | _ -> 
+  Lsequence (a, b)
+
+
+let var id : t = Lvar id
+let global_module id = Lglobal_module id
+let const ct : t = Lconst ct
+let function_ ~arity  ~params ~body : t =
+  Lfunction { arity;  params ; body}
+
+let let_ kind id e body :  t
+  = Llet (kind,id,e,body)
+let letrec bindings body : t =
+  Lletrec(bindings,body)
+let while_ a b : t  =
+  Lwhile(a,b)
+
+let try_  body id  handler : t =
+  Ltrywith(body,id,handler)
+
+let for_ v e1 e2 dir e3 : t  =
+  Lfor(v,e1,e2,dir,e3)
+
+let assign v l : t = Lassign(v,l)
+let send u m o ll v : t =
+  Lsend(u, m, o, ll, v)
+let staticcatch  a b c : t = Lstaticcatch(a,b,c)
+let staticraise a b : t = Lstaticraise(a,b)
+
+
+module Lift = struct
+  let int i : t =
+    Lconst ((Const_int {value = i; comment = None}))
+
+
+  (* let int32 i : t =
+    Lconst ((Const_int32 i)) *)
+
+  let bool b = if b then true_ else false_
+
+  (* ATTENTION: [float, nativeint] constant propogaton is not done
+     yet , due to cross platform problem
+  *)
+  (* let float b  : t =
+    Lconst ((Const_float b)) *)
+
+  (* let nativeint b : t =
+    Lconst ((Const_nativeint b)) *)
+
+  let int32 b : t =
+    Lconst ((Const_int32 b))
+
+  let int64 b : t =
+    Lconst ((Const_int64 b))
+  let string b : t =
+    Lconst ((Const_string (b)))
+  let char b : t =
+    Lconst ((Const_char b))
+end
+
+
+
+let prim ~primitive:(prim : Lam_primitive.t) ~args loc  : t =
+  let default () : t = Lprim { primitive = prim ;args; loc} in
+  match args with
+  | [Lconst a] ->
+    begin match prim, a  with
+      | Pnegint, Const_int {value = a}
+        -> Lift.int (- a)
+      (* | Pfloatofint, ( (Const_int a)) *)
+      (*   -> Lift.float (float_of_int a) *)
+      | Pintoffloat, ( (Const_float a))
+        ->
+        Lift.int (int_of_float (float_of_string a))
+      (* | Pnegfloat -> Lift.float (-. a) *)
+      (* | Pabsfloat -> Lift.float (abs_float a) *)
+      | Pstringlength, Const_string a
+        ->
+        Lift.int (String.length a)
+      (* | Pnegbint Pnativeint, ( (Const_nativeint i)) *)
+      (*   ->   *)
+      (*   Lift.nativeint (Nativeint.neg i) *)
+      | Pnegbint Pint32, Const_int32 a
+        ->
+        Lift.int32 (Int32.neg a)
+      | Pnegbint Pint64, Const_int64 a
+        ->
+        Lift.int64 (Int64.neg a)
+      | Pnot, Const_js_true -> false_
+      | Pnot, Const_js_false -> true_
+      | Pnot , Const_pointer (a,_)
+        -> Lift.bool (a = 0 )
+      | _ -> default ()
+    end
+
+
+  | [Lconst a ; Lconst b] ->
+    begin match prim, a, b  with
+      | Pbintcomp(_, cmp),  (Const_int32 a),  (Const_int32 b)
+        -> Lift.bool (Lam_compat.cmp_int32 cmp a b)
+      | Pbintcomp(_, cmp),  (Const_int64 a),  (Const_int64 b)
+        -> Lift.bool (Lam_compat.cmp_int64  cmp a b)
       | Pbintcomp(_, cmp),  (Const_nativeint a),  (Const_nativeint b)
         -> Lift.bool (Lam_compat.cmp_nativeint  cmp a b)
       | Pfloatcomp  cmp,  (Const_float a),  (Const_float b)
@@ -397715,7 +397880,7 @@ let translate_arg_cst (cst : External_arg_spec.cst) =
      E.str i
    | Arg_js_null  -> E.nil
    | Arg_js_json s 
-     -> E.raw_js_code (Exp Js_exp_unknown) s
+     -> E.raw_js_code (Exp Js_raw_json) s
 
    | Arg_js_true  -> E.bool true
    | Arg_js_false -> E.bool false 

lib/4.06.1/unstable/native_ppx.ml

@@ -9188,6 +9188,7 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
+  | Js_raw_json
   | Js_exp_unknown
 
 

lib/4.06.1/whole_compiler.ml

@@ -6104,6 +6104,7 @@ type exp =
     | RegExp of RegExp.t
   ]}
   *)
+  | Js_raw_json
   | Js_exp_unknown
 
 
@@ -381761,7 +381762,9 @@ and expression_desc cxt ~(level:int) f x : cxt  =
     (match info with
      | Exp exp_info ->
        let raw_paren =
-          not (match exp_info with  Js_literal _ -> true | _ -> false || raw_snippet_exp_simple_enough s) in 
+          not (match exp_info with  
+            | Js_literal _ | Js_raw_json -> true 
+            | Js_function _ | Js_exp_unknown -> false || raw_snippet_exp_simple_enough s) in 
        if raw_paren then P.string f L.lparen;
        P.string f s ;       
        if raw_paren then  P.string f L.rparen;
@@ -391892,7 +391895,7 @@ let translate_arg_cst (cst : External_arg_spec.cst) =
      E.str i
    | Arg_js_null  -> E.nil
    | Arg_js_json s 
-     -> E.raw_js_code (Exp Js_exp_unknown) s
+     -> E.raw_js_code (Exp Js_raw_json) s
 
    | Arg_js_true  -> E.bool true
    | Arg_js_false -> E.bool false