remove some indirection due to legacy of Ast_compatible

Author: bobzhang

jscomp/core/js_of_lam_variant.ml

@@ -31,7 +31,7 @@ type arg_expression =
   | Splice2 of E.t * E.t
 
 (* we need destruct [undefined] when input is optional *)
-let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list ) : E.t =
+let eval (arg : J.expression) (dispatches : (string * string) list ) : E.t =
   if arg == E.undefined then E.undefined 
   else
     match arg.expression_desc with
@@ -51,7 +51,7 @@ let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string)
 
 (** invariant: optional is not allowed in this case *)
 (** arg is a polyvar *)
-let eval_as_event (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list option) =
+let eval_as_event (arg : J.expression) (dispatches : (string * string) list option) =
   match arg.expression_desc with
   | Caml_block([{expression_desc = Str(_,s)}; cb], _, _, Blk_poly_var ) when Js_analyzer.no_side_effect_expression cb 
     -> 
@@ -94,7 +94,7 @@ let eval_as_event (arg : J.expression) (dispatches : (Ast_compatible.hash_label
       *)
 
 (* we need destruct [undefined] when input is optional *)
-let eval_as_int (arg : J.expression) (dispatches : (Ast_compatible.hash_label * int) list ) : E.t  =
+let eval_as_int (arg : J.expression) (dispatches : (string * int) list ) : E.t  =
   if arg == E.undefined then E.undefined else
   match arg.expression_desc with
   | Str(_,i) ->

jscomp/core/js_of_lam_variant.mli

@@ -31,17 +31,17 @@ type arg_expression =
 
 val eval :
    J.expression -> 
-   (Ast_compatible.hash_label * string) list
+   (string * string) list
    -> J.expression
 
 val eval_as_event : 
   J.expression -> 
-  (Ast_compatible.hash_label * string) list option 
+  (string * string) list option 
   -> arg_expression
 
 val eval_as_int : 
   J.expression -> 
-  (Ast_compatible.hash_label * int) list -> 
+  (string * int) list -> 
   J.expression
 
 val eval_as_unwrap : J.expression -> J.expression

jscomp/syntax/ast_compatible.mli

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type poly_var_label = Asttypes.label Asttypes.loc
+
 
 
 
@@ -33,7 +33,7 @@ type poly_var_label = Asttypes.label Asttypes.loc
 
 type loc = Location.t 
 type attrs = Parsetree.attribute list 
-type hash_label = string 
+
 open Parsetree
 
 
@@ -50,20 +50,13 @@ val const_exp_int:
   int -> 
   expression 
 
-val const_hash_label : 
-  ?loc:Location.t -> 
-  ?attrs:attrs -> 
-  string -> 
-  expression 
 
 
 val const_exp_int_list_as_array:  
   int list -> 
   expression 
 
-(* val const_exp_string_list_as_array:  
-  string list -> 
-  expression  *)
+
 
 
 val apply_simple:

jscomp/syntax/ast_polyvar.mli

@@ -26,7 +26,7 @@
 val map_row_fields_into_ints:
   Location.t -> 
   Parsetree.row_field list -> 
-  (Ast_compatible.hash_label * int ) list 
+  (string * int ) list 
 
 val map_constructor_declarations_into_ints:
   Parsetree.constructor_declaration list ->

jscomp/syntax/external_arg_spec.ml

@@ -50,20 +50,20 @@ type label =
 type attr = 
   | Poly_var_string of { 
     descr :
-    (Ast_compatible.hash_label * string) list
+    (string * string) list
    (* introduced by attributes bs.string
     and bs.as 
    *)
   } 
   | Poly_var of {
     descr : 
-    (Ast_compatible.hash_label * string) list option 
+    (string * string) list option 
       (* introduced by attributes bs.string
          and bs.as 
       *)
   } 
    (* `a does not have any value*)
-  | Int of (Ast_compatible.hash_label * int ) list (* ([`a | `b ] [@bs.int])*)
+  | Int of (string * int ) list (* ([`a | `b ] [@bs.int])*)
   | Arg_cst of cst
   | Fn_uncurry_arity of int (* annotated with [@bs.uncurry ] or [@bs.uncurry 2]*)
     (* maybe we can improve it as a combination of {!Asttypes.constant} and tuple *)

jscomp/syntax/external_arg_spec.mli

@@ -43,13 +43,13 @@ type label = private
 type attr = 
   | Poly_var_string of { 
     descr :
-    (Ast_compatible.hash_label * string) list
+    (string * string) list
   } 
   | Poly_var of {
     descr : 
-    (Ast_compatible.hash_label * string) list option 
+    (string * string) list option 
   }   
-  | Int of (Ast_compatible.hash_label * int ) list (* ([`a | `b ] [@bs.int])*)
+  | Int of (string * int ) list (* ([`a | `b ] [@bs.int])*)
   | Arg_cst of cst
   | Fn_uncurry_arity of int (* annotated with [@bs.uncurry ] or [@bs.uncurry 2]*)
   (* maybe we can improve it as a combination of {!Asttypes.constant} and tuple *)