tweak, remove compatiblity api

Author: bobzhang

jscomp/syntax/ast_compatible.ml

@@ -273,8 +273,6 @@ let object_field   l attrs ty =
 
 
 
-let hash_label (x : poly_var_label) : hash_label =  x.txt
-let label_of_name (x : poly_var_label) : string = x.txt
 
 type args  = 
   (Asttypes.arg_label * Parsetree.expression) list 

jscomp/syntax/ast_compatible.mli

@@ -197,9 +197,6 @@ type object_field =
 val object_field : Asttypes.label Asttypes.loc ->  attributes -> core_type -> object_field
 
 
-val hash_label : poly_var_label -> hash_label
-
-val label_of_name : poly_var_label -> string 
 
 type args  = 
   (Asttypes.arg_label * Parsetree.expression) list 

jscomp/syntax/ast_derive_js_mapper.ml

@@ -246,16 +246,17 @@ let init () =
                   | Some row_fields ->               
                     let expConstantArray =   
                       Exp.ident {loc; txt = Longident.Lident constantArray} in 
+                    (* let has_bs_as = ref false in    *)
                     let result :  _ list = 
                       Ext_list.map row_fields (fun tag -> 
                           match tag with 
-                          | Rtag (label, attrs, _, []) -> 
-                            (Ast_compatible.hash_label label,
+                          | Rtag ({txt}, attrs, _, []) -> 
+                            (txt,
                              match Ast_attributes.iter_process_bs_string_as_ast attrs with 
                              | Some name -> 
                                name
                              | None -> 
-                               Ast_compatible.const_exp_string(Ast_compatible.label_of_name label)
+                               Ast_compatible.const_exp_string txt
                             )
                           | _ -> assert false (* checked by [is_enum_polyvar] *)
                         ) in 

jscomp/syntax/ast_polyvar.ml

@@ -30,16 +30,14 @@ let map_row_fields_into_ints ptyp_loc
     Ext_list.fold_left row_fields (0, []) 
        (fun (i,acc) rtag -> 
           match rtag with 
-          | Rtag (label, attrs, true,  [])
+          | Rtag ({txt}, attrs, true,  [])
             -> 
-            begin match Ast_attributes.iter_process_bs_int_as attrs with 
-              | Some i -> 
-                i + 1, 
-                ((Ast_compatible.hash_label label , i):: acc ) 
-              | None -> 
-                i + 1 , 
-                ((Ast_compatible.hash_label label , i):: acc )
-            end
+            let i = 
+              match Ast_attributes.iter_process_bs_int_as attrs with 
+              | Some i ->  i | None -> i 
+            in 
+            i + 1, 
+            ((txt , i):: acc )
           | _ -> 
             Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type
        )  in 
@@ -89,22 +87,22 @@ let map_row_fields_into_strings ptyp_loc
     Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) -> 
         match nullary, tag with 
         | (`Nothing | `Null), 
-          Rtag (label, attrs, true,  [])
+          Rtag ({txt}, attrs, true,  [])
           -> 
           let name = 
             match Ast_attributes.iter_process_bs_string_as attrs with 
             | Some name -> 
               has_bs_as := true; name
-            | None -> label.txt 
-          in `Null, (label.txt, name) :: acc 
-        | (`Nothing | `NonNull), Rtag(label, attrs, false, ([ _ ])) 
+            | None -> txt 
+          in `Null, (txt, name) :: acc 
+        | (`Nothing | `NonNull), Rtag({txt}, attrs, false, ([ _ ])) 
           -> 
           let name = 
             match Ast_attributes.iter_process_bs_string_as attrs with 
             | Some name -> 
               has_bs_as := true; name
-            | None -> label.txt
-          in `NonNull, (label.txt, name) :: acc
+            | None -> txt
+          in `NonNull, (txt, name) :: acc
         | _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
 
       )  in