Merge pull request #4963 from rescript-lang/wip_lstring_switch

[refactor] refine eq approximiation for lam

Author: bobzhang

jscomp/core/lam.ml

@@ -400,7 +400,14 @@ let rec
     Lam_primitive.eq_primitive_approx info1.primitive info2.primitive &&
     eq_approx_list info1.args info2.args
     | _ -> false)
-  | Lstringswitch _ -> false  
+  | Lstringswitch (arg, patterns, default) ->
+    begin match l2 with 
+    |Lstringswitch(arg2,patterns2, default2) ->
+      eq_approx arg arg2 &&
+      eq_option default default2 &&
+      Ext_list.for_all2_no_exn patterns patterns2 (fun ((k:string),v) (k2,v2) -> k = k2 && eq_approx v v2)
+    | _ -> false  
+    end
   | Lfunction _  
   | Llet (_,_,_,_)
   | Lletrec _
@@ -410,7 +417,10 @@ let rec
   | Lfor (_,_,_,_,_) 
   | Lsend _
     -> false    
-
+and eq_option l1 l2 = 
+    match l1 with 
+    | None -> l2 = None 
+    | Some l1 -> (match l2 with Some l2 -> eq_approx l1 l2 | None -> false)
 and eq_approx_list ls ls1 =  Ext_list.for_all2_no_exn ls ls1 eq_approx
 
 

lib/4.06.1/unstable/js_compiler.ml

@@ -96369,7 +96369,14 @@ let rec
     Lam_primitive.eq_primitive_approx info1.primitive info2.primitive &&
     eq_approx_list info1.args info2.args
     | _ -> false)
-  | Lstringswitch _ -> false  
+  | Lstringswitch (arg, patterns, default) ->
+    begin match l2 with 
+    |Lstringswitch(arg2,patterns2, default2) ->
+      eq_approx arg arg2 &&
+      eq_option default default2 &&
+      Ext_list.for_all2_no_exn patterns patterns2 (fun ((k:string),v) (k2,v2) -> k = k2 && eq_approx v v2)
+    | _ -> false  
+    end
   | Lfunction _  
   | Llet (_,_,_,_)
   | Lletrec _
@@ -96379,7 +96386,10 @@ let rec
   | Lfor (_,_,_,_,_) 
   | Lsend _
     -> false    
-
+and eq_option l1 l2 = 
+    match l1 with 
+    | None -> l2 = None 
+    | Some l1 -> (match l2 with Some l2 -> eq_approx l1 l2 | None -> false)
 and eq_approx_list ls ls1 =  Ext_list.for_all2_no_exn ls ls1 eq_approx
 
 

lib/4.06.1/whole_compiler.ml

@@ -371865,7 +371865,14 @@ let rec
     Lam_primitive.eq_primitive_approx info1.primitive info2.primitive &&
     eq_approx_list info1.args info2.args
     | _ -> false)
-  | Lstringswitch _ -> false  
+  | Lstringswitch (arg, patterns, default) ->
+    begin match l2 with 
+    |Lstringswitch(arg2,patterns2, default2) ->
+      eq_approx arg arg2 &&
+      eq_option default default2 &&
+      Ext_list.for_all2_no_exn patterns patterns2 (fun ((k:string),v) (k2,v2) -> k = k2 && eq_approx v v2)
+    | _ -> false  
+    end
   | Lfunction _  
   | Llet (_,_,_,_)
   | Lletrec _
@@ -371875,7 +371882,10 @@ let rec
   | Lfor (_,_,_,_,_) 
   | Lsend _
     -> false    
-
+and eq_option l1 l2 = 
+    match l1 with 
+    | None -> l2 = None 
+    | Some l1 -> (match l2 with Some l2 -> eq_approx l1 l2 | None -> false)
 and eq_approx_list ls ls1 =  Ext_list.for_all2_no_exn ls ls1 eq_approx