Handle more cases

Author: shulhi

jscomp/core/lam.ml

@@ -468,6 +468,7 @@ end
 
 let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
   let default () : t = Lprim { primitive = prim; args; loc } in
+  (* extract the runtime representation if possible *)
   let extract_const_as c def = 
     (match c with 
     | Lam_constant.Pt_constructor({cstr_name = ({tag_type = Some(Int(v))})}) -> Int32.of_int v
@@ -494,8 +495,10 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
       | _ -> default ())
   | [ Lconst a; Lconst b ] -> (
       match (prim, a, b) with
-      | Pintcomp cmp, Const_int a, Const_int b ->
-          Lift.bool (Lam_compat.cmp_int32 cmp a.i b.i)
+      | Pintcomp cmp, Const_int {i = aa; comment = aa_pointer_info}, Const_int {i = bb; comment = bb_pointer_info} ->
+          let aa = extract_const_as aa_pointer_info aa in 
+          let bb = extract_const_as bb_pointer_info bb in 
+          Lift.bool (Lam_compat.cmp_int32 cmp aa bb)
       | Pfloatcomp cmp, Const_float a, Const_float b ->
           (* FIXME: could raise? *)
           Lift.bool
@@ -540,7 +543,8 @@ let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
           Lift.string (a ^ b)
       | ( (Pstringrefs | Pstringrefu),
           Const_string { s = a; unicode = false },
-          Const_int { i = b } ) -> (
+          Const_int { i = b; comment = pointer_info } ) -> (
+          let b = extract_const_as pointer_info b in 
           try Lift.char (Char.code (String.get a (Int32.to_int b))) with _ -> default ())
       | _ -> default ())
   | _ -> (

jscomp/test/VariantCoercion.js

@@ -126,6 +126,7 @@ module CoerceVariantBinaryOp = {
 
   let x1 = 0->lor((B :> int))
   let x2 = -(B :> int)
+  let x3 = 2 == (B :> int)
 
   type flagStr = | @as("one") One | @as("two") Two