clean up

Author: bobzhang

jscomp/core/js_dump.ml

@@ -857,11 +857,11 @@ and expression_desc cxt ~(level:int) f x : cxt  =
           ~level 
           f 
           (Object 
-             (("HASH", 
+             ((Literals.polyvar_hash, 
                if !Js_config.debug then hash
                else {hash with comment = Some name}
               ) ::
-              ("value", value) ::
+              (Literals.polyvar_value, value) ::
               if !Js_config.debug then 
                 ["name", E.str name]
               else []

jscomp/core/js_exp_make.ml

@@ -403,28 +403,26 @@ let record_access (e : t) (name : string) (pos : int32) =
 
 let poly_var_tag_access (e : t)  = 
   match e.expression_desc with
-  | Array (l,_) (* Float i -- should not appear here *)
   | Caml_block (l,_, _, _) when no_side_effect e
     -> 
     (match l  with
      | x ::_ -> x 
      | [] -> 
        assert false
     )
-  | _ -> { expression_desc = Static_index (e, "HASH", Some 0l); comment = None} 
+  | _ -> { expression_desc = Static_index (e, Literals.polyvar_hash, Some 0l); comment = None} 
 
 
 let poly_var_value_access (e : t) =   
   match e.expression_desc with
-  | Array (l,_) 
   | Caml_block (l,_, _, _) when no_side_effect e
     -> 
     (match l  with
      | _ :: v :: _ ->  v
      | _  -> 
        assert false
     )
-  | _ -> { expression_desc = Static_index (e, "value", Some 1l); comment = None} 
+  | _ -> { expression_desc = Static_index (e, Literals.polyvar_value, Some 1l); comment = None} 
 
 let extension_access (e : t) name (pos : int32)  : t  = 
   match e.expression_desc with

jscomp/ext/literals.ml

@@ -140,3 +140,6 @@ let sourcedirs_meta = ".sourcedirs.json"
 let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
+
+let polyvar_hash = "HASH"
+let polyvar_value = "value"

jscomp/ext/literals.mli

@@ -138,3 +138,6 @@ val ns_sep_char : char
 val ns_sep : string
 
 val exception_id : string
+
+val polyvar_hash : string
+val polyvar_value : string

jscomp/runtime/caml_option.ml

@@ -75,7 +75,7 @@ let option_get (x : 'a option) =
   else Obj.magic (valFromOption (Obj.repr x))
 
 
-type poly = {hash : int [@bs.as "HASH"]; value : Obj.t }  
+type poly = {hash : int [@bs.as "HASH" (* Literals.polyvar_hash*)]; value : Obj.t }  
 
 (** [input] is optional polymorphic variant *)  
 let option_unwrap (x : poly option) = 

lib/4.06.1/bsb.ml

@@ -4567,6 +4567,8 @@ val ns_sep : string
 
 val exception_id : string
 
+val polyvar_hash : string
+val polyvar_value : string
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4712,6 +4714,8 @@ let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
 
+let polyvar_hash = "HASH"
+let polyvar_value = "value"
 end
 module Ext_path : sig 
 #1 "ext_path.mli"

lib/4.06.1/bsb_helper.ml

@@ -3183,6 +3183,8 @@ val ns_sep : string
 
 val exception_id : string
 
+val polyvar_hash : string
+val polyvar_value : string
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -3328,6 +3330,8 @@ let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
 
+let polyvar_hash = "HASH"
+let polyvar_value = "value"
 end
 module Bsb_db_decode : sig 
 #1 "bsb_db_decode.mli"

lib/4.06.1/unstable/all_ounit_tests.ml

@@ -4035,6 +4035,8 @@ val ns_sep : string
 
 val exception_id : string
 
+val polyvar_hash : string
+val polyvar_value : string
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4180,6 +4182,8 @@ let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
 
+let polyvar_hash = "HASH"
+let polyvar_value = "value"
 end
 module Ounit_cmd_util : sig 
 #1 "ounit_cmd_util.mli"

lib/4.06.1/unstable/bsb_native.ml

@@ -4567,6 +4567,8 @@ val ns_sep : string
 
 val exception_id : string
 
+val polyvar_hash : string
+val polyvar_value : string
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4712,6 +4714,8 @@ let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
 
+let polyvar_hash = "HASH"
+let polyvar_value = "value"
 end
 module Ext_path : sig 
 #1 "ext_path.mli"

lib/4.06.1/unstable/bspack.ml

@@ -10074,6 +10074,8 @@ val ns_sep : string
 
 val exception_id : string
 
+val polyvar_hash : string
+val polyvar_value : string
 end = struct
 #1 "literals.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -10219,6 +10221,8 @@ let ns_sep_char = '-'
 let ns_sep = "-"
 let exception_id = "RE_EXN_ID"
 
+let polyvar_hash = "HASH"
+let polyvar_value = "value"
 end
 module Ext_path : sig 
 #1 "ext_path.mli"